diff --git a/.gitignore b/.gitignore
index 48bf770b7..2ebadd2a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,8 +133,8 @@ TAGS
 /tests/interactive/redhand_alpha.png
 /tests/interactive/test-script.json
 /tests/interactive/test-clutter-cairo-flowers
-/tests/interactive/test-box
-/tests/interactive/test-flow
+/tests/interactive/test-bin-layout
+/tests/interactive/test-flow-layout
 /tests/conform/stamp-test-conformance
 /tests/conform/test-anchors
 /tests/conform/test-conformance
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 193e1130f..a0af9d1bf 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -44,8 +44,8 @@ UNIT_TESTS = \
         test-text-field.c \
 	test-clutter-cairo-flowers.c \
 	test-cogl-vertex-buffer.c \
-	test-box.c \
-	test-flow.c
+	test-bin-layout.c \
+	test-flow-layout.c
 
 if X11_TESTS
 UNIT_TESTS += test-pixmap.c
diff --git a/tests/interactive/test-box.c b/tests/interactive/test-bin-layout.c
similarity index 99%
rename from tests/interactive/test-box.c
rename to tests/interactive/test-bin-layout.c
index 777c8e28b..8fcc0515c 100644
--- a/tests/interactive/test-box.c
+++ b/tests/interactive/test-bin-layout.c
@@ -91,7 +91,7 @@ on_box_leave (ClutterActor *box,
 }
 
 G_MODULE_EXPORT int
-test_box_main (int argc, char *argv[])
+test_bin_layout_main (int argc, char *argv[])
 {
   ClutterActor *stage, *box, *rect;
   ClutterLayoutManager *layout;
diff --git a/tests/interactive/test-flow.c b/tests/interactive/test-flow-layout.c
similarity index 98%
rename from tests/interactive/test-flow.c
rename to tests/interactive/test-flow-layout.c
index 00348e7d7..ccca5040f 100644
--- a/tests/interactive/test-flow.c
+++ b/tests/interactive/test-flow-layout.c
@@ -60,7 +60,7 @@ static GOptionEntry entries[] = {
 };
 
 G_MODULE_EXPORT int
-test_flow_main (int argc, char *argv[])
+test_flow_layout_main (int argc, char *argv[])
 {
   ClutterActor *stage, *box;
   ClutterLayoutManager *layout;