diff --git a/test_common/harness/testHarness.cpp b/test_common/harness/testHarness.cpp
index 087434e6..80c5d557 100644
--- a/test_common/harness/testHarness.cpp
+++ b/test_common/harness/testHarness.cpp
@@ -788,48 +788,6 @@ test_status callSingleTestFunction( test_definition test, cl_device_id deviceToU
     return status;
 }
 
-void checkDeviceTypeOverride( cl_device_type *inOutType )
-{
-    /* Check if we are forced to CPU mode */
-    char *force_cpu = getenv( "CL_DEVICE_TYPE" );
-    if( force_cpu != NULL )
-    {
-        if( strcmp( force_cpu, "gpu" ) == 0 || strcmp( force_cpu, "CL_DEVICE_TYPE_GPU" ) == 0 )
-            *inOutType = CL_DEVICE_TYPE_GPU;
-        else if( strcmp( force_cpu, "cpu" ) == 0 || strcmp( force_cpu, "CL_DEVICE_TYPE_CPU" ) == 0 )
-            *inOutType = CL_DEVICE_TYPE_CPU;
-        else if( strcmp( force_cpu, "accelerator" ) == 0 || strcmp( force_cpu, "CL_DEVICE_TYPE_ACCELERATOR" ) == 0 )
-            *inOutType = CL_DEVICE_TYPE_ACCELERATOR;
-        else if( strcmp( force_cpu, "CL_DEVICE_TYPE_DEFAULT" ) == 0 )
-            *inOutType = CL_DEVICE_TYPE_DEFAULT;
-    }
-
-    switch( *inOutType )
-    {
-        case CL_DEVICE_TYPE_GPU:            log_info( "Requesting GPU device " ); break;
-        case CL_DEVICE_TYPE_CPU:            log_info( "Requesting CPU device " ); break;
-        case CL_DEVICE_TYPE_ACCELERATOR:    log_info( "Requesting Accelerator device " ); break;
-        case CL_DEVICE_TYPE_DEFAULT:        log_info( "Requesting Default device " ); break;
-        default: break;
-    }
-    log_info( force_cpu != NULL ? "based on environment variable\n" : "based on command line\n" );
-
-#if defined( __APPLE__ )
-    {
-        // report on any unusual library search path indirection
-        char *libSearchPath = getenv( "DYLD_LIBRARY_PATH");
-        if( libSearchPath )
-            log_info( "*** DYLD_LIBRARY_PATH = \"%s\"\n", libSearchPath );
-
-        // report on any unusual framework search path indirection
-        char *frameworkSearchPath = getenv( "DYLD_FRAMEWORK_PATH");
-        if( libSearchPath )
-            log_info( "*** DYLD_FRAMEWORK_PATH = \"%s\"\n", frameworkSearchPath );
-    }
-#endif
-
-}
-
 #if ! defined( __APPLE__ )
 void memset_pattern4(void *dest, const void *src_pattern, size_t bytes )
 {
diff --git a/test_common/harness/testHarness.h b/test_common/harness/testHarness.h
index aa7c2616..65ae9e2d 100644
--- a/test_common/harness/testHarness.h
+++ b/test_common/harness/testHarness.h
@@ -115,10 +115,6 @@ extern test_status callSingleTestFunction( test_definition test, cl_device_id de
 
 ///// Miscellaneous steps
 
-// Given a pre-existing device type choice, check the environment for an override, then print what
-// choice was made and how (and return the overridden choice, if there is one)
-extern void checkDeviceTypeOverride( cl_device_type *inOutType );
-
 // standard callback function for context pfn_notify
 extern void CL_CALLBACK notify_callback(const char *errinfo, const void *private_info, size_t cb, void *user_data);
 
diff --git a/test_conformance/images/clFillImage/main.cpp b/test_conformance/images/clFillImage/main.cpp
index a4c8ca0c..34a7ec49 100644
--- a/test_conformance/images/clFillImage/main.cpp
+++ b/test_conformance/images/clFillImage/main.cpp
@@ -75,8 +75,6 @@ int main(int argc, const char *argv[])
     cl_channel_type  chanType;
     cl_channel_order chanOrder;
 
-    checkDeviceTypeOverride( &gDeviceType );
-
     const char ** argList = (const char **)calloc( argc, sizeof( char*) );
 
     if( NULL == argList )
diff --git a/test_conformance/images/clGetInfo/main.cpp b/test_conformance/images/clGetInfo/main.cpp
index 55aaa538..f069cdc1 100644
--- a/test_conformance/images/clGetInfo/main.cpp
+++ b/test_conformance/images/clGetInfo/main.cpp
@@ -77,8 +77,6 @@ int main(int argc, const char *argv[])
 {
     cl_channel_type chanType;
 
-    checkDeviceTypeOverride( &gDeviceType );
-
     const char ** argList = (const char **)calloc( argc, sizeof( char*) );
 
     if( NULL == argList )
diff --git a/test_conformance/images/clReadWriteImage/main.cpp b/test_conformance/images/clReadWriteImage/main.cpp
index a41c41dd..7591a334 100644
--- a/test_conformance/images/clReadWriteImage/main.cpp
+++ b/test_conformance/images/clReadWriteImage/main.cpp
@@ -75,8 +75,6 @@ int main(int argc, const char *argv[])
 {
     cl_channel_type chanType;
 
-    checkDeviceTypeOverride( &gDeviceType );
-
     const char ** argList = (const char **)calloc( argc, sizeof( char*) );
 
     if( NULL == argList )
diff --git a/test_conformance/images/kernel_image_methods/main.cpp b/test_conformance/images/kernel_image_methods/main.cpp
index bbc7ad8d..7894537e 100644
--- a/test_conformance/images/kernel_image_methods/main.cpp
+++ b/test_conformance/images/kernel_image_methods/main.cpp
@@ -82,8 +82,6 @@ int main(int argc, const char *argv[])
         return -1;
     }
 
-    checkDeviceTypeOverride( &gDeviceType );
-
     const char ** argList = (const char **)calloc( argc, sizeof( char*) );
 
     if( NULL == argList )
diff --git a/test_conformance/images/kernel_read_write/main.cpp b/test_conformance/images/kernel_read_write/main.cpp
index 5586f064..6b5a0d81 100644
--- a/test_conformance/images/kernel_read_write/main.cpp
+++ b/test_conformance/images/kernel_read_write/main.cpp
@@ -284,9 +284,6 @@ int main(int argc, const char *argv[])
         return -1;
     }
 
-    //Check CL_DEVICE_TYPE environment variable
-    checkDeviceTypeOverride( &gDeviceType );
-
     const char ** argList = (const char **)calloc( argc, sizeof( char*) );
 
     if( NULL == argList )
diff --git a/test_conformance/images/samplerlessReads/main.cpp b/test_conformance/images/samplerlessReads/main.cpp
index e034163c..e5758f6b 100644
--- a/test_conformance/images/samplerlessReads/main.cpp
+++ b/test_conformance/images/samplerlessReads/main.cpp
@@ -93,9 +93,6 @@ int main(int argc, const char *argv[])
         return -1;
     }
 
-    //Check CL_DEVICE_TYPE environment variable
-    checkDeviceTypeOverride( &gDeviceType );
-
     const char ** argList = (const char **)calloc( argc, sizeof( char*) );
 
     if( NULL == argList )