diff --git a/tests/kfdtest/scripts/kfdtest.exclude b/tests/kfdtest/scripts/kfdtest.exclude
index e133df1852..b0ea7a7947 100644
--- a/tests/kfdtest/scripts/kfdtest.exclude
+++ b/tests/kfdtest/scripts/kfdtest.exclude
@@ -11,9 +11,11 @@ FILTER[pm]=\
 # Software scheduler mode, i. e. non HWS mode
 FILTER[core_sws]=\
 "KFDQMTest.CreateDestroyCpQueue:"\
+"KFDQMTest.SubmitNopCpQueue:"\
 "KFDQMTest.SubmitPacketCpQueue:"\
 "KFDQMTest.MultipleCpQueues:"\
 "KFDQMTest.CreateDestroySdmaQueue:"\
+"KFDQMTest.SubmitNopSdmaQueue:"\
 "KFDQMTest.SubmitPacketSdmaQueue:"\
 "KFDQMTest.MultipleSdmaQueues:"\
 "KFDEventTest.SignalEvent"
diff --git a/tests/kfdtest/src/KFDQMTest.cpp b/tests/kfdtest/src/KFDQMTest.cpp
index c5abb9ff5e..13cfb96fb4 100644
--- a/tests/kfdtest/src/KFDQMTest.cpp
+++ b/tests/kfdtest/src/KFDQMTest.cpp
@@ -71,6 +71,25 @@ TEST_F(KFDQMTest, CreateDestroyCpQueue) {
     TEST_END
 }
 
+TEST_F(KFDQMTest, SubmitNopCpQueue) {
+    TEST_START(TESTPROFILE_RUNALL)
+
+    int defaultGPUNode = m_NodeInfo.HsaDefaultGPUNode();
+    ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
+
+    PM4Queue queue;
+
+    ASSERT_SUCCESS(queue.Create(defaultGPUNode));
+
+    queue.PlaceAndSubmitPacket(PM4NopPacket());
+
+    queue.Wait4PacketConsumption();
+
+    EXPECT_SUCCESS(queue.Destroy());
+
+    TEST_END
+}
+
 TEST_F(KFDQMTest, SubmitPacketCpQueue) {
     TEST_START(TESTPROFILE_RUNALL)
 
@@ -142,6 +161,25 @@ TEST_F(KFDQMTest, CreateDestroySdmaQueue) {
     TEST_END
 }
 
+TEST_F(KFDQMTest, SubmitNopSdmaQueue) {
+    TEST_START(TESTPROFILE_RUNALL)
+
+    int defaultGPUNode = m_NodeInfo.HsaDefaultGPUNode();
+    ASSERT_GE(defaultGPUNode, 0) << "failed to get default GPU Node";
+
+    SDMAQueue queue;
+
+    ASSERT_SUCCESS(queue.Create(defaultGPUNode));
+
+    queue.PlaceAndSubmitPacket(SDMANopPacket());
+
+    queue.Wait4PacketConsumption();
+
+    EXPECT_SUCCESS(queue.Destroy());
+
+    TEST_END
+}
+
 TEST_F(KFDQMTest, SubmitPacketSdmaQueue) {
     TEST_START(TESTPROFILE_RUNALL)