diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am
index 419a25374..53017c334 100644
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@@ -57,13 +57,13 @@ units_sources += \
 	actor-offscreen-redirect.c	\
 	actor-paint-opacity.c 		\
 	actor-pick.c 			\
+	actor-shader-effect.c		\
 	actor-size.c			\
 	binding-pool.c			\
 	cairo-texture.c    		\
 	group.c				\
 	path.c 				\
 	rectangle.c 			\
-	shader-effect.c			\
 	texture-fbo.c			\
 	texture.c			\
         text-cache.c               	\
diff --git a/tests/conform/actor-layout.c b/tests/conform/actor-layout.c
index 62cab0ef0..2eeaeccf2 100644
--- a/tests/conform/actor-layout.c
+++ b/tests/conform/actor-layout.c
@@ -204,8 +204,8 @@ test_state_run (TestState *state)
 }
 
 void
-basic_layout (TestConformSimpleFixture *fixture,
-              gconstpointer data)
+actor_basic_layout (TestConformSimpleFixture *fixture,
+                    gconstpointer data)
 {
   ClutterActor *stage = clutter_stage_new ();
   ClutterActor *vase;
@@ -248,8 +248,8 @@ basic_layout (TestConformSimpleFixture *fixture,
 }
 
 void
-margin_layout (TestConformSimpleFixture *fixture,
-               gconstpointer data)
+actor_margin_layout (TestConformSimpleFixture *fixture,
+                     gconstpointer data)
 {
   ClutterActor *stage = clutter_stage_new ();
   ClutterActor *vase;
diff --git a/tests/conform/actor-offscreen-redirect.c b/tests/conform/actor-offscreen-redirect.c
index 44d726773..f4d1618f7 100644
--- a/tests/conform/actor-offscreen-redirect.c
+++ b/tests/conform/actor-offscreen-redirect.c
@@ -294,8 +294,8 @@ timeout_cb (gpointer user_data)
 }
 
 void
-test_offscreen_redirect (TestConformSimpleFixture *fixture,
-                         gconstpointer test_data)
+actor_offscreen_redirect (TestConformSimpleFixture *fixture,
+                          gconstpointer test_data)
 {
   if (cogl_features_available (COGL_FEATURE_OFFSCREEN))
     {
diff --git a/tests/conform/actor-pick.c b/tests/conform/actor-pick.c
index f2930316a..e2399bae5 100644
--- a/tests/conform/actor-pick.c
+++ b/tests/conform/actor-pick.c
@@ -240,7 +240,7 @@ on_timeout (gpointer data)
 }
 
 void
-actor_picking (void)
+actor_pick (void)
 {
   int y, x;
   State state;
diff --git a/tests/conform/shader-effect.c b/tests/conform/actor-shader-effect.c
similarity index 98%
rename from tests/conform/shader-effect.c
rename to tests/conform/actor-shader-effect.c
index bafcbe5e2..db3400b77 100644
--- a/tests/conform/shader-effect.c
+++ b/tests/conform/actor-shader-effect.c
@@ -233,8 +233,8 @@ paint_cb (ClutterActor *stage)
 }
 
 void
-test_shader_effect (TestConformSimpleFixture *fixture,
-                    gconstpointer data)
+actor_shader_effect (TestConformSimpleFixture *fixture,
+                     gconstpointer data)
 {
   ClutterActor *stage;
   ClutterActor *rect;
diff --git a/tests/conform/path.c b/tests/conform/path.c
index 9790c0ef3..25c81fb68 100644
--- a/tests/conform/path.c
+++ b/tests/conform/path.c
@@ -680,7 +680,7 @@ compare_nodes (CallbackData *data)
 }
 
 void
-test_path (TestConformSimpleFixture *fixture,
+path_base (TestConformSimpleFixture *fixture,
            gconstpointer _data)
 {
   CallbackData data;
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index aaafacfff..6852b111f 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -139,13 +139,13 @@ main (int argc, char **argv)
   TEST_CONFORM_SIMPLE ("/actor", actor_container_signals);
   TEST_CONFORM_SIMPLE ("/actor", actor_destruction);
   TEST_CONFORM_SIMPLE ("/actor", actor_anchors);
-  TEST_CONFORM_SIMPLE ("/actor", actor_picking);
+  TEST_CONFORM_SIMPLE ("/actor", actor_pick);
   TEST_CONFORM_SIMPLE ("/actor", actor_fixed_size);
   TEST_CONFORM_SIMPLE ("/actor", actor_preferred_size);
-  TEST_CONFORM_SIMPLE ("/actor", basic_layout);
-  TEST_CONFORM_SIMPLE ("/actor", margin_layout);
-  TEST_CONFORM_SIMPLE ("/actor", test_offscreen_redirect);
-  TEST_CONFORM_SIMPLE ("/actor", test_shader_effect);
+  TEST_CONFORM_SIMPLE ("/actor", actor_basic_layout);
+  TEST_CONFORM_SIMPLE ("/actor", actor_margin_layout);
+  TEST_CONFORM_SIMPLE ("/actor", actor_offscreen_redirect);
+  TEST_CONFORM_SIMPLE ("/actor", actor_shader_effect);
 
   TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_children);
   TEST_CONFORM_SIMPLE ("/actor/iter", actor_iter_traverse_remove);
@@ -187,7 +187,7 @@ main (int argc, char **argv)
   TEST_CONFORM_SIMPLE ("/texture", texture_fbo);
   TEST_CONFORM_SIMPLE ("/texture/cairo", texture_cairo);
 
-  TEST_CONFORM_SIMPLE ("/path", test_path);
+  TEST_CONFORM_SIMPLE ("/path", path_base);
 
   TEST_CONFORM_SIMPLE ("/binding-pool", binding_pool);