diff --git a/test_conformance/conversions/test_conversions.cpp b/test_conformance/conversions/test_conversions.cpp
index d73df063..b37fb3b6 100644
--- a/test_conformance/conversions/test_conversions.cpp
+++ b/test_conformance/conversions/test_conversions.cpp
@@ -319,10 +319,11 @@ int main (int argc, const char **argv )
     int ret = runTestHarnessWithCheck( 1, arg, test_num, test_list, true, 0, InitCL );
 
     free_mtdata( gMTdata );
-
-    error = clFinish(gQueue);
-    if (error)
-        vlog_error("clFinish failed: %d\n", error);
+    if (gQueue) {
+        error = clFinish(gQueue);
+        if (error)
+            vlog_error("clFinish failed: %d\n", error);
+    }
 
     clReleaseMemObject(gInBuffer);
 
diff --git a/test_conformance/math_brute_force/main.cpp b/test_conformance/math_brute_force/main.cpp
index 16c03fea..0826c6b5 100644
--- a/test_conformance/math_brute_force/main.cpp
+++ b/test_conformance/math_brute_force/main.cpp
@@ -816,9 +816,11 @@ int main (int argc, const char * argv[])
     free_mtdata(gMTdata);
     free(gTestNames);
 
-    int error_code = clFinish(gQueue);
-    if (error_code)
-        vlog_error("clFinish failed:%d\n", error_code);
+    if (gQueue) {
+        int error_code = clFinish(gQueue);
+        if (error_code)
+            vlog_error("clFinish failed:%d\n", error_code);
+    }
 
     ReleaseCL();