diff --git a/projects/rocprofiler-systems/tests/rocpd-validation-rules/jpeg-decode/amd-smi-rules.json b/projects/rocprofiler-systems/tests/rocpd-validation-rules/jpeg-decode/amd-smi-rules.json
index 9ffcb9ef64..3bdf555a03 100644
--- a/projects/rocprofiler-systems/tests/rocpd-validation-rules/jpeg-decode/amd-smi-rules.json
+++ b/projects/rocprofiler-systems/tests/rocpd-validation-rules/jpeg-decode/amd-smi-rules.json
@@ -23,7 +23,8 @@
             ]
         },
         {
-            "min_rows": 500,
+            "_comment": "The actual number of samples will vary depending on the GPU. This validates presence of samples, not the actual number of samples.",
+            "min_rows": 100,
             "name_prefix": "rocpd_pmc_event_",
             "required_columns": [
                 "event_id",
@@ -35,21 +36,21 @@
                     "comparison": "greater_than",
                     "description": "Check for amd-smi monitoring busy times",
                     "error_message": "Less than expected number of captured amd-smi mm-busy samples!",
-                    "expected_result": 50,
+                    "expected_result": 10,
                     "query": "SELECT COUNT(*) as count FROM {table_name} event JOIN rocpd_info_pmc info ON event.pmc_id = info.id WHERE info.name = 'device_busy_mm'"
                 },
                 {
                     "comparison": "greater_than",
                     "description": "Check for amd-smi monitoring GPU memory usage",
                     "error_message": "Less than expected number of captured amd-smi memory-usage samples!",
-                    "expected_result": 50,
+                    "expected_result": 10,
                     "query": "SELECT COUNT(*) as count FROM {table_name} event JOIN rocpd_info_pmc info ON event.pmc_id = info.id WHERE info.name = 'device_memory_usage'"
                 },
                 {
                     "comparison": "greater_than",
                     "description": "Check for amd-smi monitoring JPEG activity",
                     "error_message": "Less than expected activity in amd-smi jpeg-activity samples!",
-                    "expected_result": 50,
+                    "expected_result": 10,
                     "query": "SELECT COUNT(*) as count FROM {table_name} event JOIN rocpd_info_pmc info ON event.pmc_id = info.id WHERE info.name LIKE 'device_jpeg_activity_%' and event.value > 0"
                 }
             ]
diff --git a/projects/rocprofiler-systems/tests/rocpd-validation-rules/roctx/amd-smi-rules.json b/projects/rocprofiler-systems/tests/rocpd-validation-rules/roctx/amd-smi-rules.json
index 5f5874cc4a..128f6a25dd 100644
--- a/projects/rocprofiler-systems/tests/rocpd-validation-rules/roctx/amd-smi-rules.json
+++ b/projects/rocprofiler-systems/tests/rocpd-validation-rules/roctx/amd-smi-rules.json
@@ -23,6 +23,7 @@
             ]
         },
         {
+            "_comment": "The actual number of samples will vary depending on the GPU. This validates presence of samples, not the actual number of samples.",
             "min_rows": 100,
             "name_prefix": "rocpd_pmc_event_",
             "required_columns": [
diff --git a/projects/rocprofiler-systems/tests/rocpd-validation-rules/video-decode/amd-smi-rules.json b/projects/rocprofiler-systems/tests/rocpd-validation-rules/video-decode/amd-smi-rules.json
index 5be074e2d4..25b6edafc5 100644
--- a/projects/rocprofiler-systems/tests/rocpd-validation-rules/video-decode/amd-smi-rules.json
+++ b/projects/rocprofiler-systems/tests/rocpd-validation-rules/video-decode/amd-smi-rules.json
@@ -23,7 +23,8 @@
             ]
         },
         {
-            "min_rows": 500,
+            "_comment": "The actual number of samples will vary depending on the GPU. This validates presence of samples, not the actual number of samples.",
+            "min_rows": 100,
             "name_prefix": "rocpd_pmc_event_",
             "required_columns": [
                 "event_id",
@@ -35,21 +36,21 @@
                     "comparison": "greater_than",
                     "description": "Check for amd-smi monitoring busy times",
                     "error_message": "Less than expected number of captured amd-smi mm-busy samples!",
-                    "expected_result": 150,
+                    "expected_result": 10,
                     "query": "SELECT COUNT(*) as count FROM {table_name} event JOIN rocpd_info_pmc info ON event.pmc_id = info.id WHERE info.name = 'device_busy_mm'"
                 },
                 {
                     "comparison": "greater_than",
                     "description": "Check for amd-smi monitoring GPU memory usage",
                     "error_message": "Less than expected number of captured amd-smi memory-usage samples!",
-                    "expected_result": 150,
+                    "expected_result": 10,
                     "query": "SELECT COUNT(*) as count FROM {table_name} event JOIN rocpd_info_pmc info ON event.pmc_id = info.id WHERE info.name = 'device_memory_usage'"
                 },
                 {
                     "comparison": "greater_than",
                     "description": "Check for amd-smi monitoring VCN activity",
                     "error_message": "Less than expected activity in amd-smi vcn-activity samples!",
-                    "expected_result": 100,
+                    "expected_result": 10,
                     "query": "SELECT COUNT(*) as count FROM {table_name} event JOIN rocpd_info_pmc info ON event.pmc_id = info.id WHERE info.name LIKE 'device_vcn_activity_%' and event.value > 0"
                 }
             ]
diff --git a/projects/rocprofiler-systems/tests/rocprof-sys-testing.cmake b/projects/rocprofiler-systems/tests/rocprof-sys-testing.cmake
index 9095c40799..ecf0d9d067 100644
--- a/projects/rocprofiler-systems/tests/rocprof-sys-testing.cmake
+++ b/projects/rocprofiler-systems/tests/rocprof-sys-testing.cmake
@@ -1227,6 +1227,14 @@ function(ROCPROFILER_SYSTEMS_ADD_VALIDATION_TEST)
         list(APPEND TEST_DEPENDS "${TEST_NAME}-run")
     endif()
 
+    # Add labels from the parent test to the validation test
+    get_test_property(${TEST_NAME} LABELS PARENT_TEST_LABELS)
+    if(PARENT_TEST_LABELS)
+        list(APPEND TEST_LABELS "${PARENT_TEST_LABELS}")
+        list(REMOVE_DUPLICATES TEST_LABELS)
+        list(SORT TEST_LABELS)
+    endif()
+
     if(NOT TEST_PASS_REGEX)
         set(TEST_PASS_REGEX
             "rocprof-sys-tests-output/${TEST_NAME}/(${TEST_TIMEMORY_FILE}|${TEST_PERFETTO_FILE}|${TEST_ROCPD_FILE}) validated"