diff --git a/examples/Makefile.am b/examples/Makefile.am
index 850584744..dc2d3588f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/build/autotools/Makefile.am.silent
 
 all_examples = \
 	basic-actor \
-	bind-constraint \
 	canvas \
 	constraints \
 	drag-action \
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 426d2eaa2..c2be9f4dc 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -49,7 +49,8 @@ UNIT_TESTS = \
 	test-devices.c \
 	test-content.c \
 	test-keyframe-transition.c \
-	test-scroll-actor.c
+	test-scroll-actor.c \
+	test-bind-constraint.c
 
 if X11_TESTS
 UNIT_TESTS += test-pixmap.c
diff --git a/examples/bind-constraint.c b/tests/interactive/test-bind-constraint.c
similarity index 97%
rename from examples/bind-constraint.c
rename to tests/interactive/test-bind-constraint.c
index 4278e1821..6cceebad7 100644
--- a/examples/bind-constraint.c
+++ b/tests/interactive/test-bind-constraint.c
@@ -154,8 +154,14 @@ on_button_release (ClutterActor *actor,
   return TRUE;
 }
 
-int
-main (int argc, char *argv[])
+G_MODULE_EXPORT const char *
+test_bind_constraint_describe (void)
+{
+  return "Demonstrate the usage of ClutterBindConstraint";
+}
+
+G_MODULE_EXPORT int
+test_bind_constraint_main (int argc, char *argv[])
 {
   ClutterActor *stage, *rect;
   ClutterConstraint *constraint;