diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 1c5654881..b1bb81ec3 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -12,33 +12,33 @@ test_conformance_SOURCES = 		\
 	test-timeline-interpolate.c 	\
 	test-timeline-rewind.c 		\
 	test-timeline.c 		\
-	test-vertex-buffer-contiguous.c \
-	test-vertex-buffer-interleved.c \
-	test-vertex-buffer-mutability.c \
+	test-cogl-vertex-buffer-contiguous.c \
+	test-cogl-vertex-buffer-interleved.c \
+	test-cogl-vertex-buffer-mutability.c \
+	test-cogl-fixed.c 		\
+	test-cogl-backface-culling.c 	\
+	test-cogl-npot-texture.c        \
+	test-cogl-blend-strings.c	\
+	test-cogl-premult.c		\
+	test-cogl-materials.c		\
+	test-cogl-viewport.c		\
+	test-cogl-offscreen.c		\
+	test-cogl-readpixels.c		\
 	test-path.c 			\
 	test-pick.c 			\
 	test-clutter-rectangle.c 	\
-	test-clutter-fixed.c 		\
 	test-actor-invariants.c 	\
 	test-paint-opacity.c 		\
-	test-backface-culling.c 	\
 	test-binding-pool.c		\
         test-clutter-text.c             \
         test-text-cache.c               \
 	test-anchors.c                  \
-	test-npot-texture.c             \
 	test-model.c			\
-	test-blend-strings.c		\
 	test-color.c			\
 	test-clutter-units.c		\
-	test-premult.c			\
-	test-materials.c		\
 	test-group.c			\
 	test-actor-size.c		\
 	test-texture-fbo.c		\
-	test-cogl-viewport.c		\
-	test-cogl-offscreen.c		\
-	test-cogl-readpixels.c		\
 	test-script-parser.c		\
         $(NULL)
 
diff --git a/tests/conform/test-backface-culling.c b/tests/conform/test-cogl-backface-culling.c
similarity index 98%
rename from tests/conform/test-backface-culling.c
rename to tests/conform/test-cogl-backface-culling.c
index f25818753..177af6048 100644
--- a/tests/conform/test-backface-culling.c
+++ b/tests/conform/test-cogl-backface-culling.c
@@ -286,8 +286,8 @@ make_texture (void)
 }
 
 void
-test_backface_culling (TestConformSimpleFixture *fixture,
-                       gconstpointer data)
+test_cogl_backface_culling (TestConformSimpleFixture *fixture,
+                            gconstpointer data)
 {
   TestState state;
   CoglHandle tex;
diff --git a/tests/conform/test-blend-strings.c b/tests/conform/test-cogl-blend-strings.c
similarity index 99%
rename from tests/conform/test-blend-strings.c
rename to tests/conform/test-cogl-blend-strings.c
index c8f5a081b..09113bbcd 100644
--- a/tests/conform/test-blend-strings.c
+++ b/tests/conform/test-cogl-blend-strings.c
@@ -379,8 +379,8 @@ queue_redraw (gpointer stage)
 }
 
 void
-test_blend_strings (TestConformSimpleFixture *fixture,
-                    gconstpointer data)
+test_cogl_blend_strings (TestConformSimpleFixture *fixture,
+                         gconstpointer data)
 {
   TestState state;
   ClutterActor *stage;
diff --git a/tests/conform/test-clutter-fixed.c b/tests/conform/test-cogl-fixed.c
similarity index 83%
rename from tests/conform/test-clutter-fixed.c
rename to tests/conform/test-cogl-fixed.c
index 0a365b336..69be33a24 100644
--- a/tests/conform/test-clutter-fixed.c
+++ b/tests/conform/test-cogl-fixed.c
@@ -4,8 +4,8 @@
 #include "test-conform-common.h"
 
 void
-test_fixed_constants (TestConformSimpleFixture *fixture,
-		      gconstpointer data)
+test_cogl_fixed (TestConformSimpleFixture *fixture,
+		 gconstpointer data)
 {
   g_assert_cmpint (COGL_FIXED_1, ==, COGL_FIXED_FROM_FLOAT (1.0));
   g_assert_cmpint (COGL_FIXED_1, ==, COGL_FIXED_FROM_INT (1));
diff --git a/tests/conform/test-materials.c b/tests/conform/test-cogl-materials.c
similarity index 98%
rename from tests/conform/test-materials.c
rename to tests/conform/test-cogl-materials.c
index eb6407040..012115131 100644
--- a/tests/conform/test-materials.c
+++ b/tests/conform/test-cogl-materials.c
@@ -158,8 +158,8 @@ queue_redraw (gpointer stage)
 }
 
 void
-test_materials (TestConformSimpleFixture *fixture,
-                gconstpointer data)
+test_cogl_materials (TestConformSimpleFixture *fixture,
+                     gconstpointer data)
 {
   TestState state;
   ClutterActor *stage;
diff --git a/tests/conform/test-npot-texture.c b/tests/conform/test-cogl-npot-texture.c
similarity index 98%
rename from tests/conform/test-npot-texture.c
rename to tests/conform/test-cogl-npot-texture.c
index 15968e072..526c5cad7 100644
--- a/tests/conform/test-npot-texture.c
+++ b/tests/conform/test-cogl-npot-texture.c
@@ -182,8 +182,8 @@ make_texture (void)
 }
 
 void
-test_npot_texture (TestConformSimpleFixture *fixture,
-                   gconstpointer data)
+test_cogl_npot_texture (TestConformSimpleFixture *fixture,
+                        gconstpointer data)
 {
   TestState state;
   ClutterActor *stage;
diff --git a/tests/conform/test-premult.c b/tests/conform/test-cogl-premult.c
similarity index 99%
rename from tests/conform/test-premult.c
rename to tests/conform/test-cogl-premult.c
index 2c1a77884..83140e4dd 100644
--- a/tests/conform/test-premult.c
+++ b/tests/conform/test-cogl-premult.c
@@ -348,8 +348,8 @@ queue_redraw (gpointer stage)
 }
 
 void
-test_premult (TestConformSimpleFixture *fixture,
-              gconstpointer data)
+test_cogl_premult (TestConformSimpleFixture *fixture,
+                   gconstpointer data)
 {
   TestState state;
   ClutterActor *stage;
diff --git a/tests/conform/test-vertex-buffer-contiguous.c b/tests/conform/test-cogl-vertex-buffer-contiguous.c
similarity index 98%
rename from tests/conform/test-vertex-buffer-contiguous.c
rename to tests/conform/test-cogl-vertex-buffer-contiguous.c
index f7a714e96..925b4f76e 100644
--- a/tests/conform/test-vertex-buffer-contiguous.c
+++ b/tests/conform/test-cogl-vertex-buffer-contiguous.c
@@ -162,8 +162,8 @@ queue_redraw (gpointer stage)
 
 
 void
-test_vertex_buffer_contiguous (TestConformSimpleFixture *fixture,
-		               gconstpointer data)
+test_cogl_vertex_buffer_contiguous (TestConformSimpleFixture *fixture,
+		                    gconstpointer data)
 {
   TestState state;
   ClutterActor *stage;
diff --git a/tests/conform/test-vertex-buffer-interleved.c b/tests/conform/test-cogl-vertex-buffer-interleved.c
similarity index 97%
rename from tests/conform/test-vertex-buffer-interleved.c
rename to tests/conform/test-cogl-vertex-buffer-interleved.c
index c91c57117..8de563305 100644
--- a/tests/conform/test-vertex-buffer-interleved.c
+++ b/tests/conform/test-cogl-vertex-buffer-interleved.c
@@ -93,8 +93,8 @@ queue_redraw (gpointer stage)
 }
 
 void
-test_vertex_buffer_interleved (TestConformSimpleFixture *fixture,
-		               gconstpointer data)
+test_cogl_vertex_buffer_interleved (TestConformSimpleFixture *fixture,
+		                    gconstpointer data)
 {
   TestState state;
   ClutterActor *stage;
diff --git a/tests/conform/test-vertex-buffer-mutability.c b/tests/conform/test-cogl-vertex-buffer-mutability.c
similarity index 97%
rename from tests/conform/test-vertex-buffer-mutability.c
rename to tests/conform/test-cogl-vertex-buffer-mutability.c
index 5c4e2eb2a..845898345 100644
--- a/tests/conform/test-vertex-buffer-mutability.c
+++ b/tests/conform/test-cogl-vertex-buffer-mutability.c
@@ -137,8 +137,8 @@ queue_redraw (gpointer stage)
 }
 
 void
-test_vertex_buffer_mutability (TestConformSimpleFixture *fixture,
-		               gconstpointer data)
+test_cogl_vertex_buffer_mutability (TestConformSimpleFixture *fixture,
+		                    gconstpointer data)
 {
   TestState state;
   ClutterActor *stage;
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index a6475bc64..dd6921629 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -131,8 +131,6 @@ main (int argc, char **argv)
   TEST_CONFORM_SIMPLE ("/rectangle", test_rect_set_size);
   TEST_CONFORM_SIMPLE ("/rectangle", test_rect_set_color);
 
-  TEST_CONFORM_SIMPLE ("/fixed", test_fixed_constants);
-
   TEST_CONFORM_SIMPLE ("/invariants", test_initial_state);
   TEST_CONFORM_SIMPLE ("/invariants", test_shown_not_parented);
   TEST_CONFORM_SIMPLE ("/invariants", test_realized);
@@ -142,17 +140,10 @@ main (int argc, char **argv)
   TEST_CONFORM_SIMPLE ("/invariants", test_show_on_set_parent);
   TEST_CONFORM_SIMPLE ("/invariants", test_clone_no_map);
 
-  TEST_CONFORM_SIMPLE ("/vertex-buffer", test_vertex_buffer_contiguous);
-  TEST_CONFORM_SIMPLE ("/vertex-buffer", test_vertex_buffer_interleved);
-  TEST_CONFORM_SIMPLE ("/vertex-buffer", test_vertex_buffer_mutability);
-
   TEST_CONFORM_SIMPLE ("/opacity", test_label_opacity);
   TEST_CONFORM_SIMPLE ("/opacity", test_rectangle_opacity);
   TEST_CONFORM_SIMPLE ("/opacity", test_paint_opacity);
 
-  TEST_CONFORM_SIMPLE ("/texture", test_backface_culling);
-  TEST_CONFORM_SIMPLE ("/texture", test_npot_texture);
-  TEST_CONFORM_SIMPLE ("/texture", test_premult);
   TEST_CONFORM_SIMPLE ("/texture", test_texture_fbo);
 
   TEST_CONFORM_SIMPLE ("/path", test_path);
@@ -165,9 +156,6 @@ main (int argc, char **argv)
   TEST_CONFORM_SIMPLE ("/model", test_list_model_iterate);
   TEST_CONFORM_SIMPLE ("/model", test_list_model_filter);
 
-  TEST_CONFORM_SIMPLE ("/material", test_materials);
-  TEST_CONFORM_SIMPLE ("/material", test_blend_strings);
-
   TEST_CONFORM_SIMPLE ("/color", test_color_from_string);
   TEST_CONFORM_SIMPLE ("/color", test_color_to_string);
   TEST_CONFORM_SIMPLE ("/color", test_color_hls_roundtrip);
@@ -181,15 +169,29 @@ main (int argc, char **argv)
   TEST_CONFORM_SIMPLE ("/sizing", test_fixed_size);
   TEST_CONFORM_SIMPLE ("/sizing", test_preferred_size);
 
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_viewport);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_offscreen);
-  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_readpixels);
-
   TEST_CONFORM_SIMPLE ("/script", test_script_single);
   TEST_CONFORM_SIMPLE ("/script", test_script_child);
   TEST_CONFORM_SIMPLE ("/script", test_script_implicit_alpha);
   TEST_CONFORM_SIMPLE ("/script", test_script_object_property);
   TEST_CONFORM_SIMPLE ("/script", test_script_animation);
 
+  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_fixed);
+  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_backface_culling);
+  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_materials);
+  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_blend_strings);
+  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_premult);
+  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_readpixels);
+
+  TEST_CONFORM_SIMPLE ("/cogl/texture", test_cogl_npot_texture);
+
+  TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_contiguous);
+  TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_interleved);
+  TEST_CONFORM_SIMPLE ("/cogl/vertex-buffer", test_cogl_vertex_buffer_mutability);
+
+  /* left to the end because they aren't currently very orthogonal and tend to
+   * break subsequent tests! */
+  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_viewport);
+  TEST_CONFORM_SIMPLE ("/cogl", test_cogl_offscreen);
+
   return g_test_run ();
 }