diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles2-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles2-khr-master.txt
index e5b48a3233..63e8136b27 100644
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles2-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles2-khr-master.txt
@@ -415,8 +415,6 @@ KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
 KHR-GLES2.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
 KHR-GLES2.core.internalformat.texture2d.luminance_unsigned_byte_luminance
 KHR-GLES2.core.internalformat.texture2d.alpha_unsigned_byte_alpha
-KHR-GLES2.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
-KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
 KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
 KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
@@ -453,8 +451,6 @@ KHR-GLES2.core.internalformat.copy_tex_image.rgba
 KHR-GLES2.core.internalformat.copy_tex_image.alpha
 KHR-GLES2.core.internalformat.copy_tex_image.luminance
 KHR-GLES2.core.internalformat.copy_tex_image.luminance_alpha
-KHR-GLES2.core.internalformat.copy_tex_image.rgba8
-KHR-GLES2.core.internalformat.copy_tex_image.rgb8
 KHR-GLES2.core.internalformat.copy_tex_image.rgb5_a1
 KHR-GLES2.core.internalformat.copy_tex_image.rgb565
 KHR-GLES2.core.internalformat.copy_tex_image.rgba4
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles3-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles3-khr-master.txt
index 9630071d74..90569106eb 100644
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles3-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles3-khr-master.txt
@@ -3237,8 +3237,6 @@ KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
 KHR-GLES3.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
 KHR-GLES3.core.internalformat.texture2d.luminance_unsigned_byte_luminance
 KHR-GLES3.core.internalformat.texture2d.alpha_unsigned_byte_alpha
-KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
-KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
 KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
 KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
@@ -3262,16 +3260,18 @@ KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
 KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
 KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
 KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
+KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
+KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES3.core.internalformat.copy_tex_image.rgb
 KHR-GLES3.core.internalformat.copy_tex_image.rgba
 KHR-GLES3.core.internalformat.copy_tex_image.alpha
 KHR-GLES3.core.internalformat.copy_tex_image.luminance
 KHR-GLES3.core.internalformat.copy_tex_image.luminance_alpha
-KHR-GLES3.core.internalformat.copy_tex_image.rgba8
-KHR-GLES3.core.internalformat.copy_tex_image.rgb8
 KHR-GLES3.core.internalformat.copy_tex_image.rgba4
 KHR-GLES3.core.internalformat.copy_tex_image.rgb5_a1
 KHR-GLES3.core.internalformat.copy_tex_image.rgb565
+KHR-GLES3.core.internalformat.copy_tex_image.rgba8
+KHR-GLES3.core.internalformat.copy_tex_image.rgb8
 KHR-GLES3.core.internalformat.renderbuffer.rgba8
 KHR-GLES3.core.internalformat.renderbuffer.rgb8
 KHR-GLES3.core.internalformat.renderbuffer.rgb5_a1
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles31-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles31-khr-master.txt
index 2d4756790e..e87e56a7ca 100644
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles31-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles31-khr-master.txt
@@ -2268,8 +2268,6 @@ KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
 KHR-GLES31.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
 KHR-GLES31.core.internalformat.texture2d.luminance_unsigned_byte_luminance
 KHR-GLES31.core.internalformat.texture2d.alpha_unsigned_byte_alpha
-KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
-KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
 KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
 KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
@@ -2293,16 +2291,18 @@ KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
 KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
 KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
 KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
+KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
+KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES31.core.internalformat.copy_tex_image.rgb
 KHR-GLES31.core.internalformat.copy_tex_image.rgba
 KHR-GLES31.core.internalformat.copy_tex_image.alpha
 KHR-GLES31.core.internalformat.copy_tex_image.luminance
 KHR-GLES31.core.internalformat.copy_tex_image.luminance_alpha
-KHR-GLES31.core.internalformat.copy_tex_image.rgba8
-KHR-GLES31.core.internalformat.copy_tex_image.rgb8
 KHR-GLES31.core.internalformat.copy_tex_image.rgba4
 KHR-GLES31.core.internalformat.copy_tex_image.rgb5_a1
 KHR-GLES31.core.internalformat.copy_tex_image.rgb565
+KHR-GLES31.core.internalformat.copy_tex_image.rgba8
+KHR-GLES31.core.internalformat.copy_tex_image.rgb8
 KHR-GLES31.core.internalformat.renderbuffer.rgba8
 KHR-GLES31.core.internalformat.renderbuffer.rgb8
 KHR-GLES31.core.internalformat.renderbuffer.rgb5_a1
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles32-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles32-khr-master.txt
index 6276c0e3b9..319460db0a 100644
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles32-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/3.2.5.x/gles32-khr-master.txt
@@ -1033,8 +1033,6 @@ KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
 KHR-GLES32.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
 KHR-GLES32.core.internalformat.texture2d.luminance_unsigned_byte_luminance
 KHR-GLES32.core.internalformat.texture2d.alpha_unsigned_byte_alpha
-KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
-KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
 KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
 KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
@@ -1058,16 +1056,18 @@ KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
 KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
 KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
 KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
+KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
+KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES32.core.internalformat.copy_tex_image.rgb
 KHR-GLES32.core.internalformat.copy_tex_image.rgba
 KHR-GLES32.core.internalformat.copy_tex_image.alpha
 KHR-GLES32.core.internalformat.copy_tex_image.luminance
 KHR-GLES32.core.internalformat.copy_tex_image.luminance_alpha
-KHR-GLES32.core.internalformat.copy_tex_image.rgba8
-KHR-GLES32.core.internalformat.copy_tex_image.rgb8
 KHR-GLES32.core.internalformat.copy_tex_image.rgba4
 KHR-GLES32.core.internalformat.copy_tex_image.rgb5_a1
 KHR-GLES32.core.internalformat.copy_tex_image.rgb565
+KHR-GLES32.core.internalformat.copy_tex_image.rgba8
+KHR-GLES32.core.internalformat.copy_tex_image.rgb8
 KHR-GLES32.core.internalformat.renderbuffer.rgba8
 KHR-GLES32.core.internalformat.renderbuffer.rgb8
 KHR-GLES32.core.internalformat.renderbuffer.rgb5_a1
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles2-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles2-khr-master.txt
index e5b48a3233..63e8136b27 100644
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles2-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles2-khr-master.txt
@@ -415,8 +415,6 @@ KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
 KHR-GLES2.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
 KHR-GLES2.core.internalformat.texture2d.luminance_unsigned_byte_luminance
 KHR-GLES2.core.internalformat.texture2d.alpha_unsigned_byte_alpha
-KHR-GLES2.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
-KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
 KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
 KHR-GLES2.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
@@ -453,8 +451,6 @@ KHR-GLES2.core.internalformat.copy_tex_image.rgba
 KHR-GLES2.core.internalformat.copy_tex_image.alpha
 KHR-GLES2.core.internalformat.copy_tex_image.luminance
 KHR-GLES2.core.internalformat.copy_tex_image.luminance_alpha
-KHR-GLES2.core.internalformat.copy_tex_image.rgba8
-KHR-GLES2.core.internalformat.copy_tex_image.rgb8
 KHR-GLES2.core.internalformat.copy_tex_image.rgb5_a1
 KHR-GLES2.core.internalformat.copy_tex_image.rgb565
 KHR-GLES2.core.internalformat.copy_tex_image.rgba4
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles3-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles3-khr-master.txt
index 9630071d74..90569106eb 100644
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles3-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles3-khr-master.txt
@@ -3237,8 +3237,6 @@ KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
 KHR-GLES3.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
 KHR-GLES3.core.internalformat.texture2d.luminance_unsigned_byte_luminance
 KHR-GLES3.core.internalformat.texture2d.alpha_unsigned_byte_alpha
-KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
-KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
 KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
 KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
@@ -3262,16 +3260,18 @@ KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
 KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
 KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
 KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
+KHR-GLES3.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
+KHR-GLES3.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES3.core.internalformat.copy_tex_image.rgb
 KHR-GLES3.core.internalformat.copy_tex_image.rgba
 KHR-GLES3.core.internalformat.copy_tex_image.alpha
 KHR-GLES3.core.internalformat.copy_tex_image.luminance
 KHR-GLES3.core.internalformat.copy_tex_image.luminance_alpha
-KHR-GLES3.core.internalformat.copy_tex_image.rgba8
-KHR-GLES3.core.internalformat.copy_tex_image.rgb8
 KHR-GLES3.core.internalformat.copy_tex_image.rgba4
 KHR-GLES3.core.internalformat.copy_tex_image.rgb5_a1
 KHR-GLES3.core.internalformat.copy_tex_image.rgb565
+KHR-GLES3.core.internalformat.copy_tex_image.rgba8
+KHR-GLES3.core.internalformat.copy_tex_image.rgb8
 KHR-GLES3.core.internalformat.renderbuffer.rgba8
 KHR-GLES3.core.internalformat.renderbuffer.rgb8
 KHR-GLES3.core.internalformat.renderbuffer.rgb5_a1
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles31-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles31-khr-master.txt
index 2d4756790e..e87e56a7ca 100644
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles31-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles31-khr-master.txt
@@ -2268,8 +2268,6 @@ KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
 KHR-GLES31.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
 KHR-GLES31.core.internalformat.texture2d.luminance_unsigned_byte_luminance
 KHR-GLES31.core.internalformat.texture2d.alpha_unsigned_byte_alpha
-KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
-KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
 KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
 KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
@@ -2293,16 +2291,18 @@ KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
 KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
 KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
 KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
+KHR-GLES31.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
+KHR-GLES31.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES31.core.internalformat.copy_tex_image.rgb
 KHR-GLES31.core.internalformat.copy_tex_image.rgba
 KHR-GLES31.core.internalformat.copy_tex_image.alpha
 KHR-GLES31.core.internalformat.copy_tex_image.luminance
 KHR-GLES31.core.internalformat.copy_tex_image.luminance_alpha
-KHR-GLES31.core.internalformat.copy_tex_image.rgba8
-KHR-GLES31.core.internalformat.copy_tex_image.rgb8
 KHR-GLES31.core.internalformat.copy_tex_image.rgba4
 KHR-GLES31.core.internalformat.copy_tex_image.rgb5_a1
 KHR-GLES31.core.internalformat.copy_tex_image.rgb565
+KHR-GLES31.core.internalformat.copy_tex_image.rgba8
+KHR-GLES31.core.internalformat.copy_tex_image.rgb8
 KHR-GLES31.core.internalformat.renderbuffer.rgba8
 KHR-GLES31.core.internalformat.renderbuffer.rgb8
 KHR-GLES31.core.internalformat.renderbuffer.rgb5_a1
diff --git a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles32-khr-master.txt b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles32-khr-master.txt
index 6276c0e3b9..319460db0a 100644
--- a/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles32-khr-master.txt
+++ b/external/openglcts/data/mustpass/gles/khronos_mustpass/master/gles32-khr-master.txt
@@ -1033,8 +1033,6 @@ KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_4_4_4_4_rgba
 KHR-GLES32.core.internalformat.texture2d.luminance_alpha_unsigned_byte_luminance_alpha
 KHR-GLES32.core.internalformat.texture2d.luminance_unsigned_byte_luminance
 KHR-GLES32.core.internalformat.texture2d.alpha_unsigned_byte_alpha
-KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
-KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgba
 KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb10_a2
 KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_int_2_10_10_10_rev_rgb5_a1
@@ -1058,16 +1056,18 @@ KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgba
 KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_short_5_5_5_1_rgb5_a1
 KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb
 KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_short_5_6_5_rgb565
+KHR-GLES32.core.internalformat.texture2d.rgb_unsigned_byte_rgb8
+KHR-GLES32.core.internalformat.texture2d.rgba_unsigned_byte_rgba8
 KHR-GLES32.core.internalformat.copy_tex_image.rgb
 KHR-GLES32.core.internalformat.copy_tex_image.rgba
 KHR-GLES32.core.internalformat.copy_tex_image.alpha
 KHR-GLES32.core.internalformat.copy_tex_image.luminance
 KHR-GLES32.core.internalformat.copy_tex_image.luminance_alpha
-KHR-GLES32.core.internalformat.copy_tex_image.rgba8
-KHR-GLES32.core.internalformat.copy_tex_image.rgb8
 KHR-GLES32.core.internalformat.copy_tex_image.rgba4
 KHR-GLES32.core.internalformat.copy_tex_image.rgb5_a1
 KHR-GLES32.core.internalformat.copy_tex_image.rgb565
+KHR-GLES32.core.internalformat.copy_tex_image.rgba8
+KHR-GLES32.core.internalformat.copy_tex_image.rgb8
 KHR-GLES32.core.internalformat.renderbuffer.rgba8
 KHR-GLES32.core.internalformat.renderbuffer.rgb8
 KHR-GLES32.core.internalformat.renderbuffer.rgb5_a1
diff --git a/external/openglcts/modules/common/glcInternalformatTests.cpp b/external/openglcts/modules/common/glcInternalformatTests.cpp
index f8c6c9db24..5783c711e9 100644
--- a/external/openglcts/modules/common/glcInternalformatTests.cpp
+++ b/external/openglcts/modules/common/glcInternalformatTests.cpp
@@ -1395,8 +1395,6 @@ void InternalformatTests::getESTestData(TestData& testData, glu::ContextType& co
 		TF(GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, GL_LUMINANCE_ALPHA),
 		TF(GL_LUMINANCE, GL_UNSIGNED_BYTE, GL_LUMINANCE),
 		TF(GL_ALPHA, GL_UNSIGNED_BYTE, GL_ALPHA),
-		TF(GL_RGB, GL_UNSIGNED_BYTE, GL_RGB8, OES_rgb8_rgba8),
-		TF(GL_RGBA, GL_UNSIGNED_BYTE, GL_RGBA8, OES_rgb8_rgba8),
 		TF(GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, GL_RGBA, EXT_texture_type_2_10_10_10_REV),
 		TF(GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, GL_RGB10_A2, EXT_texture_type_2_10_10_10_REV),
 		TF(GL_RGBA, GL_UNSIGNED_INT_2_10_10_10_REV, GL_RGB5_A1, EXT_texture_type_2_10_10_10_REV),
@@ -1420,8 +1418,6 @@ void InternalformatTests::getESTestData(TestData& testData, glu::ContextType& co
 		CF(GL_ALPHA),
 		CF(GL_LUMINANCE),
 		CF(GL_LUMINANCE_ALPHA),
-		CF(GL_RGBA8, OES_rgb8_rgba8),
-		CF(GL_RGB8, OES_rgb8_rgba8),
 	};
 
 	RenderbufferFormat commonRenderbufferFormats[] = {
@@ -1444,12 +1440,16 @@ void InternalformatTests::getESTestData(TestData& testData, glu::ContextType& co
 			TF(GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, GL_RGB5_A1),
 			TF(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, GL_RGB),
 			TF(GL_RGB, GL_UNSIGNED_SHORT_5_6_5, GL_RGB565),
+			TF(GL_RGB, GL_UNSIGNED_BYTE, GL_RGB8),
+			TF(GL_RGBA, GL_UNSIGNED_BYTE, GL_RGBA8),
 		};
 
 		CopyTexImageFormat es3CopyTexImageFormats[] = {
 			CF(GL_RGBA4),
 			CF(GL_RGB5_A1),
-			CF(GL_RGB565)
+			CF(GL_RGB565),
+			CF(GL_RGBA8),
+			CF(GL_RGB8),
 		};
 
 		RenderbufferFormat es3RenderbufferFormats[] = {