diff --git a/test_conformance/compiler/test_compiler_defines_for_extensions.cpp b/test_conformance/compiler/test_compiler_defines_for_extensions.cpp
index ffd0d6a0..4a6545b6 100644
--- a/test_conformance/compiler/test_compiler_defines_for_extensions.cpp
+++ b/test_conformance/compiler/test_compiler_defines_for_extensions.cpp
@@ -20,6 +20,7 @@
 #include <unistd.h>
 #endif
 
+// clang-format off
 // List should follow order in the extension spec
 const char *known_extensions[] = {
     "cl_khr_byte_addressable_store",
@@ -92,7 +93,9 @@ const char *known_extensions[] = {
     "cl_khr_external_memory_dma_buf",
     "cl_khr_command_buffer",
     "cl_khr_command_buffer_mutable_dispatch",
+    "cl_khr_command_buffer_multi_device"
 };
+// clang-format on
 
 size_t num_known_extensions = ARRAY_SIZE(known_extensions);
 size_t first_API_extension = 32;
diff --git a/test_conformance/extensions/cl_khr_command_buffer/command_buffer_event_sync.cpp b/test_conformance/extensions/cl_khr_command_buffer/command_buffer_event_sync.cpp
index 6ef26bb9..4ed82dea 100644
--- a/test_conformance/extensions/cl_khr_command_buffer/command_buffer_event_sync.cpp
+++ b/test_conformance/extensions/cl_khr_command_buffer/command_buffer_event_sync.cpp
@@ -18,6 +18,8 @@
 #include "procs.h"
 
 #include <vector>
+#include <thread>
+#include <chrono>
 
 //--------------------------------------------------------------------------
 enum class EventMode
@@ -416,6 +418,12 @@ struct CommandBufferEventSync : public BasicCommandBufferTest
         error = clFinish(queue);
         test_error(error, "clFinish failed");
 
+        for (unsigned i = 0; i < 30; ++i)
+        {
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            if (confirmation) break;
+        }
+
         // verify the result
         if (!confirmation)
         {
@@ -763,6 +771,12 @@ struct CommandBufferEventSync : public BasicCommandBufferTest
         error = clFinish(queue);
         test_error(error, "clFinish failed");
 
+        for (unsigned i = 0; i < 30; ++i)
+        {
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
+            if (confirmation) break;
+        }
+
         // verify the result
         if (!confirmation)
         {
diff --git a/test_conformance/generic_address_space/main.cpp b/test_conformance/generic_address_space/main.cpp
index a7897367..4d4dea46 100644
--- a/test_conformance/generic_address_space/main.cpp
+++ b/test_conformance/generic_address_space/main.cpp
@@ -92,7 +92,8 @@ test_status InitCL(cl_device_id device) {
     if (version >= Version(3, 0))
     {
         cl_int error;
-        cl_bool support_generic;
+        cl_bool support_generic = CL_FALSE;
+        size_t max_gvar_size = 0;
 
         error = clGetDeviceInfo(device, CL_DEVICE_GENERIC_ADDRESS_SPACE_SUPPORT,
                                 sizeof(support_generic), &support_generic, NULL);
@@ -106,6 +107,20 @@ test_status InitCL(cl_device_id device) {
         {
             return TEST_SKIP;
         }
+
+        error = clGetDeviceInfo(device, CL_DEVICE_MAX_GLOBAL_VARIABLE_SIZE,
+                                sizeof(max_gvar_size), &max_gvar_size, NULL);
+        if (error != CL_SUCCESS)
+        {
+            print_error(error,
+                        "Unable to query CL_DEVICE_MAX_GLOBAL_VARIABLE_SIZE.");
+            return TEST_FAIL;
+        }
+
+        if (!max_gvar_size)
+        {
+            return TEST_SKIP;
+        }
     }
 
     return TEST_PASS;