diff --git a/test_common/harness/testHarness.cpp b/test_common/harness/testHarness.cpp
index 80c5d557..38198a81 100644
--- a/test_common/harness/testHarness.cpp
+++ b/test_common/harness/testHarness.cpp
@@ -60,12 +60,12 @@ int     gHasLong = 1;
 int runTestHarness( int argc, const char *argv[], int testNum, test_definition testList[],
                     int imageSupportRequired, int forceNoContextCreation, cl_command_queue_properties queueProps )
 {
-    return runTestHarnessWithCheck( argc, argv, testNum, testList, imageSupportRequired, forceNoContextCreation, queueProps,
+    return runTestHarnessWithCheck( argc, argv, testNum, testList, forceNoContextCreation, queueProps,
                           ( imageSupportRequired ) ? verifyImageSupport : NULL );
 }
 
 int runTestHarnessWithCheck( int argc, const char *argv[], int testNum, test_definition testList[],
-                             int imageSupportRequired, int forceNoContextCreation, cl_command_queue_properties queueProps,
+                             int forceNoContextCreation, cl_command_queue_properties queueProps,
                              DeviceCheckFn deviceCheckFn )
 {
     test_start();
diff --git a/test_common/harness/testHarness.h b/test_common/harness/testHarness.h
index 65ae9e2d..6098931f 100644
--- a/test_common/harness/testHarness.h
+++ b/test_common/harness/testHarness.h
@@ -88,8 +88,8 @@ typedef test_status (*DeviceCheckFn)( cl_device_id device );
 // Returns EXIT_SUCCESS iff all tests succeeded or the tests were listed,
 // otherwise return EXIT_FAILURE.
 extern int runTestHarnessWithCheck( int argc, const char *argv[], int testNum, test_definition testList[],
-                                    int imageSupportRequired, int forceNoContextCreation,
-                                    cl_command_queue_properties queueProps, DeviceCheckFn deviceCheckFn );
+                                    int forceNoContextCreation, cl_command_queue_properties queueProps,
+                                    DeviceCheckFn deviceCheckFn );
 
 // The command line parser used by runTestHarness to break up parameters into calls to callTestFunctions
 extern int parseAndCallCommandLineTests( int argc, const char *argv[], cl_device_id device, int testNum,
diff --git a/test_conformance/SVM/main.cpp b/test_conformance/SVM/main.cpp
index 7a95fd0b..9c471f02 100644
--- a/test_conformance/SVM/main.cpp
+++ b/test_conformance/SVM/main.cpp
@@ -304,6 +304,6 @@ test_status InitCL(cl_device_id device) {
 
 int main(int argc, const char *argv[])
 {
-  return runTestHarnessWithCheck(argc, argv, test_num, test_list, false, true, 0, InitCL);
+  return runTestHarnessWithCheck(argc, argv, test_num, test_list, true, 0, InitCL);
 }
 
diff --git a/test_conformance/allocations/main.cpp b/test_conformance/allocations/main.cpp
index 342f2f60..0de1c509 100644
--- a/test_conformance/allocations/main.cpp
+++ b/test_conformance/allocations/main.cpp
@@ -335,7 +335,7 @@ int main(int argc, const char *argv[])
         }
     }
 
-    int ret = runTestHarnessWithCheck( argCount, argList, test_num, test_list, false, false, 0, init_cl );
+    int ret = runTestHarnessWithCheck( argCount, argList, test_num, test_list, false, 0, init_cl );
 
     free(argList);
     return ret;
diff --git a/test_conformance/contractions/contractions.cpp b/test_conformance/contractions/contractions.cpp
index 8f5c0cb6..e5c13ffe 100644
--- a/test_conformance/contractions/contractions.cpp
+++ b/test_conformance/contractions/contractions.cpp
@@ -331,7 +331,7 @@ int main( int argc, const char **argv )
 
     if( !error )
     {
-        error = runTestHarnessWithCheck( gArgCount, gArgList, test_num, test_list, false, true, 0, InitCL );
+        error = runTestHarnessWithCheck( gArgCount, gArgList, test_num, test_list, true, 0, InitCL );
     }
 
     if( gQueue )
diff --git a/test_conformance/conversions/test_conversions.cpp b/test_conformance/conversions/test_conversions.cpp
index 76c0f72e..0a88ab4d 100644
--- a/test_conformance/conversions/test_conversions.cpp
+++ b/test_conformance/conversions/test_conversions.cpp
@@ -316,7 +316,7 @@ int main (int argc, const char **argv )
     gMTdata = init_genrand( seed );
 
     const char* arg[] = {argv[0]};
-    int ret = runTestHarnessWithCheck( 1, arg, test_num, test_list, false, true, 0, InitCL );
+    int ret = runTestHarnessWithCheck( 1, arg, test_num, test_list, true, 0, InitCL );
 
     free_mtdata( gMTdata );
 
diff --git a/test_conformance/device_execution/main.cpp b/test_conformance/device_execution/main.cpp
index bbcb9f06..463dfa7a 100644
--- a/test_conformance/device_execution/main.cpp
+++ b/test_conformance/device_execution/main.cpp
@@ -96,5 +96,5 @@ int main(int argc, const char *argv[])
       }
     }
 
-    return runTestHarnessWithCheck(argc, argv, test_num, test_list, false, false, 0, InitCL);
+    return runTestHarnessWithCheck(argc, argv, test_num, test_list, false, 0, InitCL);
 }
diff --git a/test_conformance/half/main.cpp b/test_conformance/half/main.cpp
index 738ee91f..73fd3f9c 100644
--- a/test_conformance/half/main.cpp
+++ b/test_conformance/half/main.cpp
@@ -110,7 +110,7 @@ int main (int argc, const char **argv )
     }
 
     fflush( stdout );
-    error = runTestHarnessWithCheck( argCount, argList, test_num, test_list, false, true, 0, InitCL );
+    error = runTestHarnessWithCheck( argCount, argList, test_num, test_list, true, 0, InitCL );
 
 exit:
     if(gQueue)
diff --git a/test_conformance/math_brute_force/main.cpp b/test_conformance/math_brute_force/main.cpp
index a6f82d07..50eb6b01 100644
--- a/test_conformance/math_brute_force/main.cpp
+++ b/test_conformance/math_brute_force/main.cpp
@@ -869,7 +869,7 @@ int main (int argc, const char * argv[])
     FPU_mode_type oldMode;
     DisableFTZ( &oldMode );
 
-    int ret = runTestHarnessWithCheck( gTestNameCount, gTestNames, test_num, test_list, false, true, 0, InitCL );
+    int ret = runTestHarnessWithCheck( gTestNameCount, gTestNames, test_num, test_list, true, 0, InitCL );
 
     RestoreFPState( &oldMode );
 
diff --git a/test_conformance/pipes/main.cpp b/test_conformance/pipes/main.cpp
index d472db4d..39dca81e 100644
--- a/test_conformance/pipes/main.cpp
+++ b/test_conformance/pipes/main.cpp
@@ -103,6 +103,6 @@ test_definition test_list[] = {
 const int test_num = ARRAY_SIZE(test_list);
 
 int main(int argc, const char *argv[]) {
-  return runTestHarnessWithCheck(argc, argv, test_num, test_list, false, false,
+  return runTestHarnessWithCheck(argc, argv, test_num, test_list, false,
                                  0, InitCL);
 }
diff --git a/test_conformance/printf/test_printf.cpp b/test_conformance/printf/test_printf.cpp
index 4b066d40..661905c2 100644
--- a/test_conformance/printf/test_printf.cpp
+++ b/test_conformance/printf/test_printf.cpp
@@ -966,7 +966,7 @@ int main(int argc, const char* argv[])
         return -1;
     }
 
-    int err = runTestHarnessWithCheck( argCount, argList, test_num, test_list, false, true, 0, InitCL );
+    int err = runTestHarnessWithCheck( argCount, argList, test_num, test_list, true, 0, InitCL );
 
     if(gQueue)
     {
diff --git a/test_conformance/spirv_new/main.cpp b/test_conformance/spirv_new/main.cpp
index 0f801092..42a1251e 100644
--- a/test_conformance/spirv_new/main.cpp
+++ b/test_conformance/spirv_new/main.cpp
@@ -213,5 +213,5 @@ int main(int argc, const char *argv[])
     return runTestHarnessWithCheck(argc, argv,
                           spirvTestsRegistry::getInstance().getNumTests(),
                           spirvTestsRegistry::getInstance().getTestDefinitions(),
-                          false, false, 0, checkAddressWidth);
+                          false, 0, checkAddressWidth);
 }
diff --git a/test_conformance/subgroups/main.cpp b/test_conformance/subgroups/main.cpp
index 445a6a8a..5c007eee 100644
--- a/test_conformance/subgroups/main.cpp
+++ b/test_conformance/subgroups/main.cpp
@@ -59,6 +59,6 @@ static test_status checkSubGroupsExtension(cl_device_id device)
 int main(int argc, const char *argv[])
 {
     gMTdata = init_genrand(0);
-    return runTestHarnessWithCheck(argc, argv, test_num, test_list, false, false, 0, checkSubGroupsExtension);
+    return runTestHarnessWithCheck(argc, argv, test_num, test_list, false, 0, checkSubGroupsExtension);
 }