diff --git a/test_common/harness/testHarness.cpp b/test_common/harness/testHarness.cpp
index b2516331..48dd4829 100644
--- a/test_common/harness/testHarness.cpp
+++ b/test_common/harness/testHarness.cpp
@@ -480,6 +480,7 @@ int runTestHarnessWithCheck(int argc, const char *argv[], int testNum,
                 case TEST_PASS: break;
                 case TEST_FAIL: return fail_init_info(testNum);
                 case TEST_SKIP: return skip_init_info(testNum);
+                case TEST_SKIPPED_ITSELF: return skip_init_info(testNum);
             }
         }
     }
@@ -493,6 +494,7 @@ int runTestHarnessWithCheck(int argc, const char *argv[], int testNum,
             case TEST_PASS: break;
             case TEST_FAIL: return fail_init_info(testNum);
             case TEST_SKIP: return skip_init_info(testNum);
+            case TEST_SKIPPED_ITSELF: return skip_init_info(testNum);
         }
     }
 
diff --git a/test_common/harness/testHarness.h b/test_common/harness/testHarness.h
index d681616a..331555b2 100644
--- a/test_common/harness/testHarness.h
+++ b/test_common/harness/testHarness.h
@@ -80,6 +80,7 @@ typedef enum test_status
     TEST_PASS = 0,
     TEST_FAIL = 1,
     TEST_SKIP = 2,
+    TEST_SKIPPED_ITSELF = -100,
 } test_status;
 
 extern int gFailCount;
diff --git a/test_common/harness/threadTesting.h b/test_common/harness/threadTesting.h
index 91ff279f..765eabcc 100644
--- a/test_common/harness/threadTesting.h
+++ b/test_common/harness/threadTesting.h
@@ -22,8 +22,6 @@
 #include <CL/opencl.h>
 #endif
 
-#define TEST_SKIPPED_ITSELF -100
-
 typedef int (*basefn)(cl_device_id deviceID, cl_context context,
                       cl_command_queue queue, int num_elements);
 extern int test_threaded_function(basefn fnToTest, cl_device_id device,