diff --git a/test_conformance/device_execution/enqueue_flags.cpp b/test_conformance/device_execution/enqueue_flags.cpp
index ff6e3e36..6dd4e122 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, "    {"
@@ -209,7 +209,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, "    {"
@@ -291,7 +291,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, "    {"
@@ -363,7 +363,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 && gid == group_id)"
     NL, "    {"
@@ -438,7 +438,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 && gid == group_id)"
     NL, "    {"
@@ -524,7 +524,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 && gid == group_id)"
     NL, "    {"
@@ -609,7 +609,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 && gid == group_id)"
     NL, "    {"