diff --git a/android/cts/master/com.drawelements.deqp.gles2.xml b/android/cts/master/com.drawelements.deqp.gles2.xml
index 18f18f5..2d928b7 100644
--- a/android/cts/master/com.drawelements.deqp.gles2.xml
+++ b/android/cts/master/com.drawelements.deqp.gles2.xml
@@ -26565,13 +26565,7 @@
 					</TestCase>
 				</TestSuite>
 				<TestCase name="wrap">
-					<Test name="clamp_clamp_nearest_pot_rgba8888">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
-					<Test name="clamp_clamp_nearest_pot_rgb888">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
-					<Test name="clamp_clamp_nearest_pot_l8">
+					<Test name="clamp_clamp_nearest_npot_rgba8888">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="clamp_clamp_nearest_npot_rgb888">
@@ -26604,40 +26598,34 @@
 					<Test name="clamp_clamp_linear_npot_l8">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="clamp_repeat_nearest_pot_rgba8888">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
-					<Test name="clamp_mirror_nearest_pot_rgba8888">
+					<Test name="clamp_repeat_linear_pot_rgba8888">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="clamp_mirror_linear_pot_rgba8888">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="repeat_clamp_nearest_pot_rgba8888">
+					<Test name="repeat_clamp_linear_pot_rgba8888">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="repeat_repeat_nearest_pot_rgba8888">
+					<Test name="repeat_repeat_linear_pot_rgba8888">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="repeat_mirror_nearest_pot_rgba8888">
+					<Test name="repeat_mirror_linear_pot_rgba8888">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="repeat_mirror_nearest_pot_rgb888">
+					<Test name="repeat_mirror_linear_pot_rgb888">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="repeat_mirror_nearest_pot_l8">
+					<Test name="repeat_mirror_linear_pot_rgba4444">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="mirror_clamp_nearest_pot_rgba8888">
+					<Test name="repeat_mirror_linear_pot_l8">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="mirror_clamp_linear_pot_rgba8888">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="mirror_repeat_nearest_pot_rgba8888">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
-					<Test name="mirror_mirror_nearest_pot_rgba8888">
+					<Test name="mirror_repeat_linear_pot_rgba8888">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="mirror_mirror_linear_pot_rgba8888">
diff --git a/android/cts/master/gles2-master.txt b/android/cts/master/gles2-master.txt
index 327c01a..2623d49 100644
--- a/android/cts/master/gles2-master.txt
+++ b/android/cts/master/gles2-master.txt
@@ -8669,9 +8669,7 @@
 dEQP-GLES2.functional.texture.size.cube.512x512_rgb888_mipmap
 dEQP-GLES2.functional.texture.size.cube.512x512_rgba8888
 dEQP-GLES2.functional.texture.size.cube.512x512_rgba8888_mipmap
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgb888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_l8
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgba8888
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgb888
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_l8
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_pot_rgba8888
@@ -8682,18 +8680,16 @@
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_npot_rgb888
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_npot_rgba4444
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_npot_l8
-dEQP-GLES2.functional.texture.wrap.clamp_repeat_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.clamp_mirror_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.clamp_repeat_linear_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.clamp_mirror_linear_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_clamp_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgb888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_l8
-dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_clamp_linear_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_repeat_linear_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgb888
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgba4444
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_l8
 dEQP-GLES2.functional.texture.wrap.mirror_clamp_linear_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.mirror_repeat_linear_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.mirror_mirror_linear_pot_rgba8888
 dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_clamp_etc1
 dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_nearest_linear_clamp_etc1
diff --git a/android/cts/master/src/gles2-test-issues.txt b/android/cts/master/src/gles2-test-issues.txt
index a3c854a..30788f9 100644
--- a/android/cts/master/src/gles2-test-issues.txt
+++ b/android/cts/master/src/gles2-test-issues.txt
@@ -53,3 +53,19 @@
 
 # Bug 26906226
 dEQP-GLES2.functional.texture.units.*
+
+# Bug 26542781
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgb888
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_l8
+dEQP-GLES2.functional.texture.wrap.clamp_repeat_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.clamp_mirror_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_clamp_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgb888
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_l8
+dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_rgba8888
+dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_rgba8888
+