diff --git a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
index 52f65b08bd..e133df1852 100644
--- a/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
+++ b/projects/rocr-runtime/tests/kfdtest/scripts/kfdtest.exclude
@@ -8,16 +8,21 @@ FILTER[pm]=\
 
 
 # Core tests, used in scenarios like bringup
-FILTER[core]=\
+# Software scheduler mode, i. e. non HWS mode
+FILTER[core_sws]=\
 "KFDQMTest.CreateDestroyCpQueue:"\
 "KFDQMTest.SubmitPacketCpQueue:"\
 "KFDQMTest.MultipleCpQueues:"\
 "KFDQMTest.CreateDestroySdmaQueue:"\
 "KFDQMTest.SubmitPacketSdmaQueue:"\
 "KFDQMTest.MultipleSdmaQueues:"\
-"KFDCWSRTest.BasicTest:"\
 "KFDEventTest.SignalEvent"
 
+# HWS mode
+FILTER[core]=\
+"${FILTER[core_sws]}:"\
+"KFDCWSRTest.BasicTest"
+
 
 # Permanent exclusions
 # These tests are included for debugging, but are not executed in normal execution on any ASIC:
diff --git a/projects/rocr-runtime/tests/kfdtest/scripts/run_kfdtest.sh b/projects/rocr-runtime/tests/kfdtest/scripts/run_kfdtest.sh
index 7493dc00f1..52a1dd20a0 100755
--- a/projects/rocr-runtime/tests/kfdtest/scripts/run_kfdtest.sh
+++ b/projects/rocr-runtime/tests/kfdtest/scripts/run_kfdtest.sh
@@ -52,7 +52,7 @@ printUsage() {
     echo
     echo "Gtest arguments will be forwarded to the app"
     echo
-    echo "Valid platform options: pm, core, polaris10, vega10, vega20, all, and so on"
+    echo "Valid platform options: core_sws, core, polaris10, vega10, vega20, pm, all, and so on"
     echo "'all' option runs all tests"
 
     return 0