diff --git a/projects/clr/hipamd/tests/src/CMakeLists.txt b/projects/clr/hipamd/tests/src/CMakeLists.txt
index 77882428e2..8d37f79208 100644
--- a/projects/clr/hipamd/tests/src/CMakeLists.txt
+++ b/projects/clr/hipamd/tests/src/CMakeLists.txt
@@ -104,8 +104,8 @@ make_hip_executable (hip_clz hip_clz.cpp)
 make_hip_executable (hip_brev hip_brev.cpp) 
 make_hip_executable (hip_ffs hip_ffs.cpp) 
 make_hip_executable (hipInfo hipInfo.cpp) 
-make_hip_executable (hipSetValidDevices hipSetValidDevices.cpp)
 make_hip_executable (hipMemcpy hipMemcpy.cpp) 
+make_hip_executable (hipMemset hipMemset.cpp) 
 make_hip_executable (hipEventRecord hipEventRecord.cpp) 
 make_hip_executable (hipLanguageExtensions hipLanguageExtensions.cpp) 
 make_hip_executable (hipGridLaunch hipGridLaunch.cpp) 
@@ -128,7 +128,6 @@ make_test(hipMemset --N 10    --memsetval 0x42 )  # small copy, just 10 bytes.
 make_test(hipMemset --N 10013 --memsetval 0x5a )  # oddball size.
 make_test(hipMemset --N 500M  --memsetval 0xa6 )  # big copy
 make_test(hipGridLaunch " " )
-make_test(hipSetValidDevices " " )
 
 make_test(hipMemcpy  " " )
 
diff --git a/projects/clr/hipamd/tests/src/hipMemset.cpp b/projects/clr/hipamd/tests/src/hipMemset.cpp
index 63e14a5369..9769acaf25 100644
--- a/projects/clr/hipamd/tests/src/hipMemset.cpp
+++ b/projects/clr/hipamd/tests/src/hipMemset.cpp
@@ -31,9 +31,11 @@ int main(int argc, char *argv[])
 
     HipTest::parseStandardArguments(argc, argv, true);
 
+    HIPCHECK(hipSetDevice(p_gpuDevice));
+
     size_t Nbytes = N*sizeof(char);
 
-    printf ("N=%zu  memsetval=%2x\n", N, memsetval);
+    printf ("N=%zu  memsetval=%2x device=%d\n", N, memsetval, p_gpuDevice);
 
     char *A_d;
     char *A_h;
diff --git a/projects/clr/hipamd/tests/src/test_common.cpp b/projects/clr/hipamd/tests/src/test_common.cpp
index 45d01d147b..d7a108a11b 100644
--- a/projects/clr/hipamd/tests/src/test_common.cpp
+++ b/projects/clr/hipamd/tests/src/test_common.cpp
@@ -27,6 +27,7 @@ char memsetval=0x42;
 int iterations = 1;
 unsigned blocksPerCU = 6; // to hide latency
 unsigned threadsPerBlock = 256; 
+int p_gpuDevice = 0;
 
 
 
@@ -105,7 +106,12 @@ int parseStandardArguments(int argc, char *argv[], bool failOnUndefinedArg)
             memsetval = ex;
         } else if (!strcmp(arg, "--iterations") || (!strcmp(arg, "-i"))) {
             if (++i >= argc || !HipTest::parseInt(argv[i], &iterations)) {
-               failed("Bad itertions argument"); 
+               failed("Bad iterations argument"); 
+            }
+
+        } else if (!strcmp(arg, "--gpu") || (!strcmp(arg, "-g"))) {
+            if (++i >= argc || !HipTest::parseInt(argv[i], &p_gpuDevice)) {
+               failed("Bad gpuDevice argument"); 
             }
 
         } 
diff --git a/projects/clr/hipamd/tests/src/test_common.h b/projects/clr/hipamd/tests/src/test_common.h
index ac89459956..fee052c1ad 100644
--- a/projects/clr/hipamd/tests/src/test_common.h
+++ b/projects/clr/hipamd/tests/src/test_common.h
@@ -52,6 +52,7 @@ extern char memsetval;
 extern int iterations;
 extern unsigned blocksPerCU;
 extern unsigned threadsPerBlock;
+extern int p_gpuDevice;
 
 namespace HipTest {