diff --git a/test_conformance/device_execution/enqueue_flags.cpp b/test_conformance/device_execution/enqueue_flags.cpp
index d3858c66..cad996c6 100644
--- a/test_conformance/device_execution/enqueue_flags.cpp
+++ b/test_conformance/device_execution/enqueue_flags.cpp
@@ -54,7 +54,7 @@ static const char* enqueue_flags_wait_kernel_simple[] =
     NL, ""
     NL, "  if((index + 1) == BITS_DEPTH)"
     NL, "  {"
-    NL, "    barrier(CLK_LOCAL_MEM_FENCE);"
+    NL, "    barrier(CLK_GLOBAL_MEM_FENCE);"
     NL, ""
     NL, "    if(lid == 0)"
     NL, "    {"
@@ -126,7 +126,7 @@ static const char* enqueue_flags_wait_kernel_event[] =
     NL, ""
     NL, "  if((index + 1) == BITS_DEPTH)"
     NL, "  {"
-    NL, "    barrier(CLK_LOCAL_MEM_FENCE);"
+    NL, "    barrier(CLK_GLOBAL_MEM_FENCE);"
     NL, ""
     NL, "    if(lid == 0)"
     NL, "    {"
@@ -208,7 +208,7 @@ static const char* enqueue_flags_wait_kernel_local[] =
     NL, ""
     NL, "  if((index + 1) == BITS_DEPTH)"
     NL, "  {"
-    NL, "    barrier(CLK_LOCAL_MEM_FENCE);"
+    NL, "    barrier(CLK_GLOBAL_MEM_FENCE);"
     NL, ""
     NL, "    if(lid == 0)"
     NL, "    {"
@@ -289,7 +289,7 @@ static const char* enqueue_flags_wait_kernel_event_local[] =
     NL, ""
     NL, "  if((index + 1) == BITS_DEPTH)"
     NL, "  {"
-    NL, "    barrier(CLK_LOCAL_MEM_FENCE);"
+    NL, "    barrier(CLK_GLOBAL_MEM_FENCE);"
     NL, ""
     NL, "    if(lid == 0)"
     NL, "    {"
@@ -361,7 +361,7 @@ static const char* enqueue_flags_wait_work_group_simple[] =
     NL, ""
     NL, "  if((index + 1) == BITS_DEPTH)"
     NL, "  {"
-    NL, "    barrier(CLK_LOCAL_MEM_FENCE);"
+    NL, "    barrier(CLK_GLOBAL_MEM_FENCE);"
     NL, ""
     NL, "    if(lid == 0)"
     NL, "    {"
@@ -436,7 +436,7 @@ static const char* enqueue_flags_wait_work_group_event[] =
     NL, ""
     NL, "  if((index + 1) == BITS_DEPTH)"
     NL, "  {"
-    NL, "    barrier(CLK_LOCAL_MEM_FENCE);"
+    NL, "    barrier(CLK_GLOBAL_MEM_FENCE);"
     NL, ""
     NL, "    if(lid == 0)"
     NL, "    {"
@@ -522,7 +522,7 @@ static const char* enqueue_flags_wait_work_group_local[] =
     NL, ""
     NL, "  if((index + 1) == BITS_DEPTH)"
     NL, "  {"
-    NL, "    barrier(CLK_LOCAL_MEM_FENCE);"
+    NL, "    barrier(CLK_GLOBAL_MEM_FENCE);"
     NL, ""
     NL, "    if(lid == 0)"
     NL, "    {"
@@ -607,7 +607,7 @@ static const char* enqueue_flags_wait_work_group_event_local[] =
     NL, ""
     NL, "  if((index + 1) == BITS_DEPTH)"
     NL, "  {"
-    NL, "    barrier(CLK_LOCAL_MEM_FENCE);"
+    NL, "    barrier(CLK_GLOBAL_MEM_FENCE);"
     NL, ""
     NL, "    if(lid == 0)"
     NL, "    {"