diff --git a/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp b/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp
index 40024510b6..c0962f96b7 100644
--- a/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp
+++ b/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp
@@ -486,7 +486,7 @@ TEST_F(KFDEvictTest, QueueTest) {
     addrBuffer.Fill(0x5678);
 
     /* Wait for shader to finish or timeout if shader has vm page fault */
-    EXPECT_EQ(0, dispatch0.SyncWithStatus(180000));
+    EXPECT_EQ(0, dispatch0.SyncWithStatus(g_TestTimeOut * 5));
 
     EXPECT_SUCCESS(pm4Queue.Destroy());
 
diff --git a/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp b/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp
index dc115e5697..5c592351ed 100644
--- a/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp
+++ b/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp
@@ -399,7 +399,7 @@ TEST_P(KFDSVMEvictTest, QueueTest) {
     addrBuffer.Fill(0x5678);
 
     /* wait for shader to finish or timeout if shade has vm page fault */
-    dispatch0.SyncWithStatus(120000);
+    dispatch0.SyncWithStatus(g_TestTimeOut * 5);
 
     ASSERT_SUCCESS(pm4Queue.Destroy());
     /* LOG() << m_psName << "free buffer" << std::endl; */
diff --git a/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp b/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp
index 022b2df152..8d2cb40fff 100644
--- a/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp
+++ b/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp
@@ -27,7 +27,7 @@
 #include "GoogleTestExtension.hpp"
 #include "OSWrapper.hpp"
 
-#define KFD_TEST_DEFAULT_TIMEOUT 10000
+#define KFD_TEST_DEFAULT_TIMEOUT 60000
 
 std::ostream& operator << (std::ostream& out, TESTPROFILE profile) {
     switch (profile) {