diff --git a/util/test/rdtest/shared/Subgroup_Zoo.py b/util/test/rdtest/shared/Subgroup_Zoo.py
index 6aed0a4c7..29ef8076c 100644
--- a/util/test/rdtest/shared/Subgroup_Zoo.py
+++ b/util/test/rdtest/shared/Subgroup_Zoo.py
@@ -8,12 +8,6 @@ class Subgroup_Zoo(rdtest.TestCase):
     demos_test_name = None
     workgroup = (0, 0, 0)
 
-    def check_support(self, **kwargs):
-        # Only allow this if explicitly run
-        if kwargs['test_include'] == self.demos_test_name:
-            return True, ''
-        return False, 'Disabled test'
-
     def check_compute_thread_result(self, test, action, x, y, z, dim, bufdata):
         try:
             real = struct.unpack_from(
@@ -169,7 +163,7 @@ class Subgroup_Zoo(rdtest.TestCase):
                             rdtest.log.error(
                                 f"Test {idx} at {action.eventId} got no debug result at {vtx} inst {inst} view {view}")
                             failed = True
-                            return
+                            continue
 
                         _, variables = self.process_trace(trace)
 
diff --git a/util/test/tests/D3D11/D3D11_Workgroup_Zoo.py b/util/test/tests/D3D11/D3D11_Workgroup_Zoo.py
index 81dfe4338..88ae42e24 100644
--- a/util/test/tests/D3D11/D3D11_Workgroup_Zoo.py
+++ b/util/test/tests/D3D11/D3D11_Workgroup_Zoo.py
@@ -3,3 +3,10 @@ import rdtest
 class D3D11_Workgroup_Zoo(rdtest.Workgroup_Zoo):
     demos_test_name = 'D3D11_Workgroup_Zoo'
     internal = False
+
+    def check_support(self, **kwargs):
+        # Only allow this if explicitly run
+        if kwargs['test_include'] == self.demos_test_name:
+            return True, ''
+        return False, 'Disabled test'
+
diff --git a/util/test/tests/D3D12/D3D12_Subgroup_Zoo.py b/util/test/tests/D3D12/D3D12_Subgroup_Zoo.py
index 0450d2fd4..5efe22f75 100644
--- a/util/test/tests/D3D12/D3D12_Subgroup_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Subgroup_Zoo.py
@@ -2,4 +2,10 @@ import rdtest
 
 class D3D12_Subgroup_Zoo(rdtest.Subgroup_Zoo):
     demos_test_name = 'D3D12_Subgroup_Zoo'
-    internal = False
\ No newline at end of file
+    internal = False
+
+    def check_support(self, **kwargs):
+        # Only allow this if explicitly run
+        if kwargs['test_include'] == self.demos_test_name:
+            return True, ''
+        return False, 'Disabled test'
\ No newline at end of file
diff --git a/util/test/tests/D3D12/D3D12_Workgroup_Zoo.py b/util/test/tests/D3D12/D3D12_Workgroup_Zoo.py
index b049cbfb8..fdbee406d 100644
--- a/util/test/tests/D3D12/D3D12_Workgroup_Zoo.py
+++ b/util/test/tests/D3D12/D3D12_Workgroup_Zoo.py
@@ -3,3 +3,10 @@ import rdtest
 class D3D12_Workgroup_Zoo(rdtest.Workgroup_Zoo):
     demos_test_name = 'D3D12_Workgroup_Zoo'
     internal = False
+
+    def check_support(self, **kwargs):
+        # Only allow this if explicitly run
+        if kwargs['test_include'] == self.demos_test_name:
+            return True, ''
+        return False, 'Disabled test'
+