diff --git a/ChangeLog b/ChangeLog
index f71882749..1b2b02a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-28  Neil Roberts  <neil@linux.intel.com>
+
+	* tests/conform/test-backface-culling.c (TEXTURE_SIZE): Don't set
+	to a funny size on GLES because it will break cogl_texture_polygon
+
 2008-11-28  Neil Roberts  <neil@linux.intel.com>
 
 	* tests/conform/test-backface-culling.c: New test for backface
diff --git a/tests/conform/test-backface-culling.c b/tests/conform/test-backface-culling.c
index 3a18d8916..3b7948e96 100644
--- a/tests/conform/test-backface-culling.c
+++ b/tests/conform/test-backface-culling.c
@@ -7,10 +7,21 @@
 
 static const ClutterColor stage_color = { 0x0, 0x0, 0x0, 0xff };
 
+#ifdef CLUTTER_COGL_HAS_GL
+
 /* Size the texture so that it is just off a power of two to enourage
    it so use software tiling when NPOTs aren't available */
 #define TEXTURE_SIZE 33
 
+#else /* CLUTTER_COGL_HAS_GL */
+
+/* We can't use the funny-sized texture on GL ES because it will break
+   cogl_texture_polygon. However there is only one code path for
+   rendering quads so there is no need */
+#define TEXTURE_SIZE 32
+
+#endif /* CLUTTER_COGL_HAS_GL */
+
 /* Amount of pixels to skip off the top, bottom, left and right of the
    texture when reading back the stage */
 #define TEST_INSET   4