diff --git a/ChangeLog b/ChangeLog
index 8a38a21ab..577ab4ce5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-10  Neil Roberts  <neil@linux.intel.com>
+
+	* tests/interactive/test-main.c (main): Allow more than two
+	arguments so that the remaining arguments can be passed to the
+	test. This is needed for test-behave for example which can take a
+	--path argument.
+
 2008-11-10  Emmanuele Bassi  <ebassi@linux.intel.com>
 
 	* clutter/clutter-texture.c: Remove an unused function.
diff --git a/tests/interactive/test-main.c b/tests/interactive/test-main.c
index 1724ededa..2a0cd74a5 100644
--- a/tests/interactive/test-main.c
+++ b/tests/interactive/test-main.c
@@ -12,7 +12,7 @@ main (int argc, char **argv)
   int (*unit_test_main) (int argc, char **argv);
   int ret;
 
-  if (argc != 2)
+  if (argc < 2)
     g_error ("Usage: %s unit_test", argv[0]);
   
   module = g_module_open (NULL, 0);