diff --git a/ChangeLog b/ChangeLog
index bd439e55c..9f58fe40b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-14  Robert Bragg  <ebassi@linux.intel.com>
+	
+	* tests/interactive/Makefile.am
+	* tests/interactive/test-pixmap.c:
+	test-pixmap + test-devices accidentally got dropped from the makefiles
+	when changing the unit test layout; this puts them back.
+
 2008-11-14  Emmanuele Bassi  <ebassi@linux.intel.com>
 
 	Bug 1265 - ClutterScore doesn't emit 'started' signal (Bastian
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index e69d1bc43..0c17a33a1 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -37,6 +37,11 @@ UNIT_TESTS = \
 	test-texture-quality.c \
 	test-layout.c
 
+if X11_TESTS
+UNIT_TESTS += test-pixmap.c
+UNIT_TESTS += test-devices.c
+endif
+
 #FIXME - this is is a bit of a yukky way of ensuring the tests find our data:
 test-script.json:
 	ln -sf $(top_srcdir)/tests/data/test-script.json
diff --git a/tests/interactive/test-pixmap.c b/tests/interactive/test-pixmap.c
index cd6bc5785..17451dcbe 100644
--- a/tests/interactive/test-pixmap.c
+++ b/tests/interactive/test-pixmap.c
@@ -259,5 +259,5 @@ test_pixmap_main (int argc, char **argv)
 }
 
 #else /* HAVE_CLUTTER_GLX */
-int main (int argc, char **argv) { return EXIT_SUCCESS; };
+int test_pixmap_main (int argc, char **argv) { return EXIT_SUCCESS; };
 #endif /* HAVE_CLUTTER_GLX */