diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index d3b76c1..4a2a176 100644
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -417,7 +417,6 @@
 dEQP-EGL.functional.choose_config.color_component_type_ext.dont_care
 dEQP-EGL.functional.choose_config.color_component_type_ext.fixed
 dEQP-EGL.functional.choose_config.color_component_type_ext.float
-dEQP-EGL.functional.color_clears.single_context.gles1.rgb565_window
 dEQP-EGL.functional.color_clears.single_context.gles1.rgb565_pixmap
 dEQP-EGL.functional.color_clears.single_context.gles1.rgb565_pbuffer
 dEQP-EGL.functional.color_clears.single_context.gles1.rgb888_window
diff --git a/android/cts/master/src/egl-driver-issues.txt b/android/cts/master/src/egl-driver-issues.txt
new file mode 100644
index 0000000..9227bc4
--- /dev/null
+++ b/android/cts/master/src/egl-driver-issues.txt
@@ -0,0 +1,2 @@
+# Bug 30041221
+dEQP-EGL.functional.color_clears.single_context.gles1.rgb565_window
diff --git a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
index 253f727..1451e74 100644
--- a/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
@@ -2261,6 +2261,7 @@
 			context.getTestContext().touchWatchdog();
 	}
 
+	context.getTestContext().touchWatchdog();
 	objects.clear();
 
 	return tcu::TestStatus::pass("Ok");
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 0a53fb4..dae0b99 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -346,7 +346,8 @@
 MASTER_EGL_COMMON_FILTERS		= [include("egl-master.txt"),
 								   exclude("egl-test-issues.txt"),
 								   exclude("egl-internal-api-tests.txt"),
-								   exclude("egl-manual-robustness.txt")]
+								   exclude("egl-manual-robustness.txt"),
+								   exclude("egl-driver-issues.txt")]
 MASTER_EGL_PKG					= Package(module = EGL_MODULE, configurations = [
 		# Master
 		Configuration(name			= "master",