diff --git a/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp b/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp
index 1a806b08f4..4827d58c3b 100644
--- a/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp
+++ b/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp
@@ -48,6 +48,7 @@ std::ostream& operator << (std::ostream& out, TESTPROFILE profile) {
     return out;
 }
 
+unsigned int g_TestGPUsNum ;
 unsigned int g_TestRunProfile;
 unsigned int g_TestENVCaps;
 unsigned int g_TestTimeOut;
@@ -106,6 +107,14 @@ GTEST_API_ int main(int argc, char **argv) {
             LOG() << "Sleep time in seconds as specified by user: " << std::dec << g_SleepTime << std::endl;
         }
 
+        char *testGPUsNum = NULL;
+        /* if HSA_TEST_GPUS_NUM is defined use it, otherwise test on 1 gpu */
+        testGPUsNum = getenv("HSA_TEST_GPUS_NUM");
+        if (testGPUsNum)
+            g_TestGPUsNum = std::max(1, atoi(testGPUsNum));
+        else
+            g_TestGPUsNum = 1;
+
         /* init LLVM one time*/
         Init_LLVM();