diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index ae87b02..64241ea 100644
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -3265,7 +3265,6 @@
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3279,7 +3278,6 @@
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/android/cts/nyc/egl-master.txt b/android/cts/nyc/egl-master.txt
index 9426a8f..0a49063 100644
--- a/android/cts/nyc/egl-master.txt
+++ b/android/cts/nyc/egl-master.txt
@@ -3229,7 +3229,6 @@
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3243,7 +3242,6 @@
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/android/cts/nyc/src/egl-master.txt b/android/cts/nyc/src/egl-master.txt
index 9426a8f..0a49063 100644
--- a/android/cts/nyc/src/egl-master.txt
+++ b/android/cts/nyc/src/egl-master.txt
@@ -3229,7 +3229,6 @@
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3243,7 +3242,6 @@
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/egl-master.txt
index bf85b1b..c96be01 100644
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/egl-master.txt
@@ -3265,7 +3265,6 @@
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3279,7 +3278,6 @@
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-master.txt
index 9df361a..b0ee43d 100644
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/3.2.3.x/src/egl-master.txt
@@ -3344,7 +3344,6 @@
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3358,7 +3357,6 @@
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt b/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt
index ac78cb5..15d1523 100644
--- a/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt
+++ b/external/openglcts/data/mustpass/egl/aosp_mustpass/master/egl-master.txt
@@ -3265,7 +3265,6 @@
 dEQP-EGL.functional.reusable_sync.valid.get_status
 dEQP-EGL.functional.reusable_sync.valid.get_status_signaled
 dEQP-EGL.functional.reusable_sync.valid.destroy
-dEQP-EGL.functional.reusable_sync.valid.wait_server
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_type
 dEQP-EGL.functional.reusable_sync.invalid.create_invalid_attribs
@@ -3279,7 +3278,6 @@
 dEQP-EGL.functional.reusable_sync.invalid.destroy_invalid_sync
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_display
 dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_sync
-dEQP-EGL.functional.reusable_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.resize.surface_size.shrink
 dEQP-EGL.functional.resize.surface_size.grow
 dEQP-EGL.functional.resize.surface_size.stretch_width
diff --git a/modules/egl/teglSyncTests.cpp b/modules/egl/teglSyncTests.cpp
index a21f0d2..17e841c 100644
--- a/modules/egl/teglSyncTests.cpp
+++ b/modules/egl/teglSyncTests.cpp
@@ -1293,9 +1293,6 @@
 		// eglDestroySyncKHR tests
 		valid->addChild(new DestroySyncTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
 
-		// eglWaitSyncKHR tests
-		valid->addChild(new WaitSyncTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
-
 		addChild(valid);
 	}
 
@@ -1325,7 +1322,6 @@
 		// eglWaitSyncKHR tests
 		invalid->addChild(new WaitSyncInvalidDisplayTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
 		invalid->addChild(new WaitSyncInvalidSyncTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
-		invalid->addChild(new WaitSyncInvalidFlagTest(m_eglTestCtx, EGL_SYNC_REUSABLE_KHR));
 
 		addChild(invalid);
 	}