diff --git a/tests/kfdtest/src/KFDQMTest.cpp b/tests/kfdtest/src/KFDQMTest.cpp
index 53471dedd9..d4f02b2911 100644
--- a/tests/kfdtest/src/KFDQMTest.cpp
+++ b/tests/kfdtest/src/KFDQMTest.cpp
@@ -112,23 +112,18 @@ TEST_F(KFDQMTest, CreateMultipleSdmaQueues) {
     int bufSize = PAGE_SIZE;
     ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
 
-    unsigned int MAX_SDMA_QUEUES;
-
-    if (m_FamilyId == FAMILY_RV)
-        MAX_SDMA_QUEUES = 2;
-    else
-        MAX_SDMA_QUEUES = 4;
+    const unsigned int numSdmaQueues = m_numSdmaEngines * m_numSdmaQueuesPerEngine;
 
     HsaMemoryBuffer destBuf(bufSize << 1 , defaultGPUNode, false);
     HsaMemoryBuffer srcBuf(bufSize, defaultGPUNode, false);
     destBuf.Fill(0xFF);
 
-    SDMAQueue queues[MAX_SDMA_QUEUES];
+    std::vector<SDMAQueue> queues(numSdmaQueues);
 
-    for (unsigned int qidx = 0; qidx < MAX_SDMA_QUEUES; ++qidx)
+    for (unsigned int qidx = 0; qidx < numSdmaQueues; ++qidx)
         ASSERT_SUCCESS(queues[qidx].Create(defaultGPUNode));
 
-    for (unsigned int qidx = 0; qidx < MAX_SDMA_QUEUES; ++qidx) {
+    for (unsigned int qidx = 0; qidx < numSdmaQueues; ++qidx) {
         destBuf.Fill(0x0);
         srcBuf.Fill(qidx + 0xa0);
         queues[qidx].PlaceAndSubmitPacket(
@@ -144,7 +139,7 @@ TEST_F(KFDQMTest, CreateMultipleSdmaQueues) {
             destBuf.As<unsigned int*>(), srcBuf.As<unsigned int*>(), bufSize));
     }
 
-    for (unsigned int qidx = 0; qidx < MAX_SDMA_QUEUES; ++qidx)
+    for (unsigned int qidx = 0; qidx < numSdmaQueues; ++qidx)
         EXPECT_SUCCESS(queues[qidx].Destroy());
 
     TEST_END