diff --git a/test_common/harness/testHarness.cpp b/test_common/harness/testHarness.cpp
index 6a3cacc9..b2516331 100644
--- a/test_common/harness/testHarness.cpp
+++ b/test_common/harness/testHarness.cpp
@@ -61,13 +61,11 @@ bool gCoreILProgram = true;
 #define DEFAULT_NUM_ELEMENTS 0x4000
 
 int runTestHarness(int argc, const char *argv[], int testNum,
-                   test_definition testList[], int imageSupportRequired,
-                   int forceNoContextCreation,
+                   test_definition testList[], int forceNoContextCreation,
                    cl_command_queue_properties queueProps)
 {
-    return runTestHarnessWithCheck(
-        argc, argv, testNum, testList, forceNoContextCreation, queueProps,
-        (imageSupportRequired) ? verifyImageSupport : NULL);
+    return runTestHarnessWithCheck(argc, argv, testNum, testList,
+                                   forceNoContextCreation, queueProps, NULL);
 }
 
 int skip_init_info(int count)
diff --git a/test_common/harness/testHarness.h b/test_common/harness/testHarness.h
index 235926ac..d681616a 100644
--- a/test_common/harness/testHarness.h
+++ b/test_common/harness/testHarness.h
@@ -92,7 +92,7 @@ extern cl_uint gRandomSeed;
 // dictatated by the passed arguments. Returns EXIT_SUCCESS iff all tests
 // succeeded or the tests were listed, otherwise return EXIT_FAILURE.
 extern int runTestHarness(int argc, const char *argv[], int testNum,
-                          test_definition testList[], int imageSupportRequired,
+                          test_definition testList[],
                           int forceNoContextCreation,
                           cl_command_queue_properties queueProps);
 
diff --git a/test_conformance/api/main.cpp b/test_conformance/api/main.cpp
index 06f87392..10e2b57e 100644
--- a/test_conformance/api/main.cpp
+++ b/test_conformance/api/main.cpp
@@ -152,5 +152,5 @@ const int test_num = ARRAY_SIZE(test_list);
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness(argc, argv, test_num, test_list, false, false, 0);
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
diff --git a/test_conformance/atomics/main.cpp b/test_conformance/atomics/main.cpp
index 6904d7c3..afdea376 100644
--- a/test_conformance/atomics/main.cpp
+++ b/test_conformance/atomics/main.cpp
@@ -45,6 +45,6 @@ const int test_num = ARRAY_SIZE( test_list );
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
 
diff --git a/test_conformance/basic/main.cpp b/test_conformance/basic/main.cpp
index 911f5e7b..d1a35fae 100644
--- a/test_conformance/basic/main.cpp
+++ b/test_conformance/basic/main.cpp
@@ -157,6 +157,6 @@ const int test_num = ARRAY_SIZE( test_list );
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
 
diff --git a/test_conformance/buffers/main.cpp b/test_conformance/buffers/main.cpp
index c8713127..7c5502a7 100644
--- a/test_conformance/buffers/main.cpp
+++ b/test_conformance/buffers/main.cpp
@@ -141,5 +141,5 @@ const char* flag_set_names[] = {
 
 int main( int argc, const char *argv[] )
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
diff --git a/test_conformance/clcpp/address_spaces/main.cpp b/test_conformance/clcpp/address_spaces/main.cpp
index 3bda012d..d618e179 100644
--- a/test_conformance/clcpp/address_spaces/main.cpp
+++ b/test_conformance/clcpp/address_spaces/main.cpp
@@ -21,5 +21,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/api/main.cpp b/test_conformance/clcpp/api/main.cpp
index 89f8f1b9..76528384 100644
--- a/test_conformance/clcpp/api/main.cpp
+++ b/test_conformance/clcpp/api/main.cpp
@@ -23,5 +23,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/atomics/main.cpp b/test_conformance/clcpp/atomics/main.cpp
index 71039985..b9f964fa 100644
--- a/test_conformance/clcpp/atomics/main.cpp
+++ b/test_conformance/clcpp/atomics/main.cpp
@@ -21,5 +21,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/attributes/main.cpp b/test_conformance/clcpp/attributes/main.cpp
index 765867e7..e731c001 100644
--- a/test_conformance/clcpp/attributes/main.cpp
+++ b/test_conformance/clcpp/attributes/main.cpp
@@ -23,5 +23,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/common_funcs/main.cpp b/test_conformance/clcpp/common_funcs/main.cpp
index a66d8f2f..4a6277a3 100644
--- a/test_conformance/clcpp/common_funcs/main.cpp
+++ b/test_conformance/clcpp/common_funcs/main.cpp
@@ -39,5 +39,5 @@ int main(int argc, const char *argv[])
     }
 
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/convert/main.cpp b/test_conformance/clcpp/convert/main.cpp
index 9f4ed09f..78e37637 100644
--- a/test_conformance/clcpp/convert/main.cpp
+++ b/test_conformance/clcpp/convert/main.cpp
@@ -21,5 +21,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/device_queue/main.cpp b/test_conformance/clcpp/device_queue/main.cpp
index 1075c78b..0467b19f 100644
--- a/test_conformance/clcpp/device_queue/main.cpp
+++ b/test_conformance/clcpp/device_queue/main.cpp
@@ -21,5 +21,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/geometric_funcs/main.cpp b/test_conformance/clcpp/geometric_funcs/main.cpp
index ee3a51bd..ed35805c 100644
--- a/test_conformance/clcpp/geometric_funcs/main.cpp
+++ b/test_conformance/clcpp/geometric_funcs/main.cpp
@@ -40,5 +40,5 @@ int main(int argc, const char *argv[])
     }
 
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/images/main.cpp b/test_conformance/clcpp/images/main.cpp
index 8c41bb6a..bbda559d 100644
--- a/test_conformance/clcpp/images/main.cpp
+++ b/test_conformance/clcpp/images/main.cpp
@@ -26,5 +26,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/integer_funcs/main.cpp b/test_conformance/clcpp/integer_funcs/main.cpp
index ab2664a2..c6cdfb61 100644
--- a/test_conformance/clcpp/integer_funcs/main.cpp
+++ b/test_conformance/clcpp/integer_funcs/main.cpp
@@ -22,5 +22,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/math_funcs/main.cpp b/test_conformance/clcpp/math_funcs/main.cpp
index aada85f7..b5134871 100644
--- a/test_conformance/clcpp/math_funcs/main.cpp
+++ b/test_conformance/clcpp/math_funcs/main.cpp
@@ -46,5 +46,5 @@ int main(int argc, const char *argv[])
     }
 
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/pipes/main.cpp b/test_conformance/clcpp/pipes/main.cpp
index de6e6221..0ed4ef68 100644
--- a/test_conformance/clcpp/pipes/main.cpp
+++ b/test_conformance/clcpp/pipes/main.cpp
@@ -21,5 +21,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/program_scope_ctors_dtors/main.cpp b/test_conformance/clcpp/program_scope_ctors_dtors/main.cpp
index 08c19082..78b07739 100644
--- a/test_conformance/clcpp/program_scope_ctors_dtors/main.cpp
+++ b/test_conformance/clcpp/program_scope_ctors_dtors/main.cpp
@@ -20,5 +20,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/reinterpret/main.cpp b/test_conformance/clcpp/reinterpret/main.cpp
index 8eddf1d1..06d7056f 100644
--- a/test_conformance/clcpp/reinterpret/main.cpp
+++ b/test_conformance/clcpp/reinterpret/main.cpp
@@ -21,5 +21,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/relational_funcs/main.cpp b/test_conformance/clcpp/relational_funcs/main.cpp
index 99b0e5a9..2b72d3d2 100644
--- a/test_conformance/clcpp/relational_funcs/main.cpp
+++ b/test_conformance/clcpp/relational_funcs/main.cpp
@@ -22,5 +22,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/spec_constants/main.cpp b/test_conformance/clcpp/spec_constants/main.cpp
index 0582ed54..305eb7dc 100644
--- a/test_conformance/clcpp/spec_constants/main.cpp
+++ b/test_conformance/clcpp/spec_constants/main.cpp
@@ -22,5 +22,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/subgroups/main.cpp b/test_conformance/clcpp/subgroups/main.cpp
index c0262288..c81f2315 100644
--- a/test_conformance/clcpp/subgroups/main.cpp
+++ b/test_conformance/clcpp/subgroups/main.cpp
@@ -25,5 +25,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/synchronization/main.cpp b/test_conformance/clcpp/synchronization/main.cpp
index b337238c..04b5f36a 100644
--- a/test_conformance/clcpp/synchronization/main.cpp
+++ b/test_conformance/clcpp/synchronization/main.cpp
@@ -23,5 +23,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/vload_vstore/main.cpp b/test_conformance/clcpp/vload_vstore/main.cpp
index 3893905d..e5c4fdd0 100644
--- a/test_conformance/clcpp/vload_vstore/main.cpp
+++ b/test_conformance/clcpp/vload_vstore/main.cpp
@@ -21,5 +21,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/workgroups/main.cpp b/test_conformance/clcpp/workgroups/main.cpp
index 508753cf..924bb44c 100644
--- a/test_conformance/clcpp/workgroups/main.cpp
+++ b/test_conformance/clcpp/workgroups/main.cpp
@@ -25,5 +25,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/clcpp/workitems/main.cpp b/test_conformance/clcpp/workitems/main.cpp
index 1c322dfd..aacbdd49 100644
--- a/test_conformance/clcpp/workitems/main.cpp
+++ b/test_conformance/clcpp/workitems/main.cpp
@@ -21,5 +21,5 @@
 int main(int argc, const char *argv[])
 {
     auto& tests = autotest::test_suite::global_test_suite().test_defs;
-    return runTestHarness(argc, argv, tests.size(), tests.data(), false, false, 0);
+    return runTestHarness(argc, argv, tests.size(), tests.data(), false, 0);
 }
diff --git a/test_conformance/commonfns/main.cpp b/test_conformance/commonfns/main.cpp
index 739e09ee..b8364d5a 100644
--- a/test_conformance/commonfns/main.cpp
+++ b/test_conformance/commonfns/main.cpp
@@ -58,6 +58,6 @@ const int test_num = ARRAY_SIZE( test_list );
 int main(int argc, const char *argv[])
 {
     initVecSizes();
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
 
diff --git a/test_conformance/compiler/main.cpp b/test_conformance/compiler/main.cpp
index 19479285..f0a9ef3a 100644
--- a/test_conformance/compiler/main.cpp
+++ b/test_conformance/compiler/main.cpp
@@ -107,5 +107,5 @@ const int test_num = ARRAY_SIZE(test_list);
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness(argc, argv, test_num, test_list, false, false, 0);
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
diff --git a/test_conformance/computeinfo/main.cpp b/test_conformance/computeinfo/main.cpp
index 19aadb7a..47975f86 100644
--- a/test_conformance/computeinfo/main.cpp
+++ b/test_conformance/computeinfo/main.cpp
@@ -1455,6 +1455,5 @@ int main(int argc, const char** argv)
         }
     }
 
-    return runTestHarness(argCount, argList, test_num, test_list, false, true,
-                          0);
+    return runTestHarness(argCount, argList, test_num, test_list, true, 0);
 }
diff --git a/test_conformance/device_partition/main.cpp b/test_conformance/device_partition/main.cpp
index f5f081ea..a8af6ffb 100644
--- a/test_conformance/device_partition/main.cpp
+++ b/test_conformance/device_partition/main.cpp
@@ -41,5 +41,5 @@ const int test_num = ARRAY_SIZE( test_list );
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, true, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, true, 0);
 }
diff --git a/test_conformance/events/main.cpp b/test_conformance/events/main.cpp
index 2aafb0e5..777d2d36 100644
--- a/test_conformance/events/main.cpp
+++ b/test_conformance/events/main.cpp
@@ -62,6 +62,6 @@ const int test_num = ARRAY_SIZE( test_list );
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
 
diff --git a/test_conformance/geometrics/main.cpp b/test_conformance/geometrics/main.cpp
index 038999de..45f2b069 100644
--- a/test_conformance/geometrics/main.cpp
+++ b/test_conformance/geometrics/main.cpp
@@ -38,6 +38,6 @@ const int test_num = ARRAY_SIZE( test_list );
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
 
diff --git a/test_conformance/images/clCopyImage/main.cpp b/test_conformance/images/clCopyImage/main.cpp
index f64119e9..c2cad010 100644
--- a/test_conformance/images/clCopyImage/main.cpp
+++ b/test_conformance/images/clCopyImage/main.cpp
@@ -151,7 +151,8 @@ int main(int argc, const char *argv[])
     if( gTestSmallImages )
         log_info( "Note: Using small test images\n" );
 
-    int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
+    int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
+                                      false, 0, verifyImageSupport);
 
     free(argList);
     return ret;
diff --git a/test_conformance/images/clFillImage/main.cpp b/test_conformance/images/clFillImage/main.cpp
index 1f09a49e..b19d85af 100644
--- a/test_conformance/images/clFillImage/main.cpp
+++ b/test_conformance/images/clFillImage/main.cpp
@@ -124,7 +124,8 @@ int main(int argc, const char *argv[])
     if ( gTestSmallImages )
         log_info( "Note: Using small test images\n" );
 
-    int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
+    int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
+                                      false, 0, verifyImageSupport);
 
     free(argList);
     return ret;
diff --git a/test_conformance/images/clGetInfo/main.cpp b/test_conformance/images/clGetInfo/main.cpp
index 10694186..80b3cbb2 100644
--- a/test_conformance/images/clGetInfo/main.cpp
+++ b/test_conformance/images/clGetInfo/main.cpp
@@ -108,7 +108,8 @@ int main(int argc, const char *argv[])
     if( gTestSmallImages )
         log_info( "Note: Using small test images\n" );
 
-    int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
+    int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
+                                      false, 0, verifyImageSupport);
 
     free(argList);
     return ret;
diff --git a/test_conformance/images/clReadWriteImage/main.cpp b/test_conformance/images/clReadWriteImage/main.cpp
index 5fd5367d..18c7e239 100644
--- a/test_conformance/images/clReadWriteImage/main.cpp
+++ b/test_conformance/images/clReadWriteImage/main.cpp
@@ -112,7 +112,8 @@ int main(int argc, const char *argv[])
     if( gTestSmallImages )
         log_info( "Note: Using small test images\n" );
 
-    int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
+    int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
+                                      false, 0, verifyImageSupport);
 
     free(argList);
     return ret;
diff --git a/test_conformance/images/kernel_image_methods/main.cpp b/test_conformance/images/kernel_image_methods/main.cpp
index a08f133d..e1320ce3 100644
--- a/test_conformance/images/kernel_image_methods/main.cpp
+++ b/test_conformance/images/kernel_image_methods/main.cpp
@@ -112,7 +112,8 @@ int main(int argc, const char *argv[])
     if( gTestSmallImages )
         log_info( "Note: Using small test images\n" );
 
-    int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
+    int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
+                                      false, 0, verifyImageSupport);
 
     free(argList);
     return ret;
diff --git a/test_conformance/images/kernel_read_write/main.cpp b/test_conformance/images/kernel_read_write/main.cpp
index 243cff7c..f430c7f5 100644
--- a/test_conformance/images/kernel_read_write/main.cpp
+++ b/test_conformance/images/kernel_read_write/main.cpp
@@ -395,7 +395,8 @@ int main(int argc, const char *argv[])
     FPU_mode_type oldMode;
     DisableFTZ(&oldMode);
 
-    int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
+    int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
+                                      false, 0, verifyImageSupport);
 
     // Restore FP state before leaving
     RestoreFPState(&oldMode);
diff --git a/test_conformance/images/samplerlessReads/main.cpp b/test_conformance/images/samplerlessReads/main.cpp
index 8f69e73c..cb442592 100644
--- a/test_conformance/images/samplerlessReads/main.cpp
+++ b/test_conformance/images/samplerlessReads/main.cpp
@@ -152,7 +152,8 @@ int main(int argc, const char *argv[])
     FPU_mode_type oldMode;
     DisableFTZ(&oldMode);
 
-    int ret = runTestHarness( argCount, argList, test_num, test_list, true, false, 0 );
+    int ret = runTestHarnessWithCheck(argCount, argList, test_num, test_list,
+                                      false, 0, verifyImageSupport);
 
     // Restore FP state before leaving
     RestoreFPState(&oldMode);
diff --git a/test_conformance/integer_ops/main.cpp b/test_conformance/integer_ops/main.cpp
index 1a8bad5f..00e91661 100644
--- a/test_conformance/integer_ops/main.cpp
+++ b/test_conformance/integer_ops/main.cpp
@@ -212,6 +212,6 @@ void fill_test_values( cl_long *outBufferA, cl_long *outBufferB, size_t numEleme
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
 
diff --git a/test_conformance/mem_host_flags/main.cpp b/test_conformance/mem_host_flags/main.cpp
index 01bad676..f0649808 100644
--- a/test_conformance/mem_host_flags/main.cpp
+++ b/test_conformance/mem_host_flags/main.cpp
@@ -47,5 +47,5 @@ int main(int argc, const char *argv[])
 {
     log_info("1st part, non gl-sharing objects...\n");
     gTestRounding = true;
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
diff --git a/test_conformance/multiple_device_context/main.cpp b/test_conformance/multiple_device_context/main.cpp
index 10276668..6e16c244 100644
--- a/test_conformance/multiple_device_context/main.cpp
+++ b/test_conformance/multiple_device_context/main.cpp
@@ -41,6 +41,6 @@ const int test_num = ARRAY_SIZE( test_list );
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, true, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, true, 0);
 }
 
diff --git a/test_conformance/profiling/main.cpp b/test_conformance/profiling/main.cpp
index bd367976..6e59f611 100644
--- a/test_conformance/profiling/main.cpp
+++ b/test_conformance/profiling/main.cpp
@@ -126,6 +126,7 @@ int check_times(cl_ulong queueStart, cl_ulong commandSubmit, cl_ulong commandSta
 
 int main( int argc, const char *argv[] )
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, false, CL_QUEUE_PROFILING_ENABLE );
+    return runTestHarness(argc, argv, test_num, test_list, false,
+                          CL_QUEUE_PROFILING_ENABLE);
 }
 
diff --git a/test_conformance/relationals/main.cpp b/test_conformance/relationals/main.cpp
index ec495c89..61bde2d0 100644
--- a/test_conformance/relationals/main.cpp
+++ b/test_conformance/relationals/main.cpp
@@ -70,6 +70,6 @@ const int test_num = ARRAY_SIZE( test_list );
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
 
diff --git a/test_conformance/select/test_select.cpp b/test_conformance/select/test_select.cpp
index da136b48..35f154ac 100644
--- a/test_conformance/select/test_select.cpp
+++ b/test_conformance/select/test_select.cpp
@@ -343,7 +343,7 @@ static int doTest(cl_command_queue queue, cl_context context, Type stype, Type c
         programs[vecsize] = makeSelectProgram(&kernels[vecsize], context, stype, cmptype, element_count[vecsize] );
         if (!programs[vecsize] || !kernels[vecsize]) {
             ++s_test_fail;
-            ++s_test_cnt;
+            ++s_test_cnt;
             return -1;
         }
     }
@@ -645,7 +645,7 @@ int main(int argc, const char* argv[])
         log_info("*** Wimpy Reduction Factor: %-27u ***\n\n", s_wimpy_reduction_factor);
     }
 
-    int err = runTestHarness( argCount, argList, test_num, test_list, false, false, 0 );
+    int err = runTestHarness(argCount, argList, test_num, test_list, false, 0);
 
     free( argList );
 
diff --git a/test_conformance/thread_dimensions/main.cpp b/test_conformance/thread_dimensions/main.cpp
index bddbc0f9..9a1ce609 100644
--- a/test_conformance/thread_dimensions/main.cpp
+++ b/test_conformance/thread_dimensions/main.cpp
@@ -38,6 +38,6 @@ const int test_num = ARRAY_SIZE( test_list );
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness( argc, argv, test_num, test_list, false, false, 0 );
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
 
diff --git a/test_conformance/vectors/main.cpp b/test_conformance/vectors/main.cpp
index 98f278c3..e499faf9 100644
--- a/test_conformance/vectors/main.cpp
+++ b/test_conformance/vectors/main.cpp
@@ -40,5 +40,5 @@ const int test_num = ARRAY_SIZE(test_list);
 
 int main(int argc, const char *argv[])
 {
-    return runTestHarness(argc, argv, test_num, test_list, false, false, 0);
+    return runTestHarness(argc, argv, test_num, test_list, false, 0);
 }
diff --git a/test_extensions/media_sharing/main.cpp b/test_extensions/media_sharing/main.cpp
index 98b766ac..f0c3aff8 100644
--- a/test_extensions/media_sharing/main.cpp
+++ b/test_extensions/media_sharing/main.cpp
@@ -200,5 +200,5 @@ int main(int argc, const char *argv[])
   if (!MediaSurfaceSharingExtensionInit())
     return TEST_FAIL;
 
-  return runTestHarness(argc, argv, test_num, test_list, false, true, 0);
+  return runTestHarness(argc, argv, test_num, test_list, true, 0);
 }