diff --git a/Makefile b/Makefile
index 4bea211ce7..6ce0c0d127 100644
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,15 @@ build: dist/setup-config
 	$(CABAL) build $(CABALFLAGS)
 
 test:
-	make -C test IDRIS=../dist/build/idris
+	$(MAKE) -C test IDRIS=../dist/build/idris
 
 test_java:
-	make -C test IDRIS=../dist/build/idris test_java
+	$(MAKE) -C test IDRIS=../dist/build/idris test_java
 
 relib:
-	make -C lib IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts clean
-	make -C effects IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
-	make -C javascript IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
+	$(MAKE) -C lib IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts clean
+	$(MAKE) -C effects IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
+	$(MAKE) -C javascript IDRIS=../dist/build/idris/idris RTS=../dist/build/rts/libidris_rts DIST=../dist/build clean
 	$(CABAL) install $(CABALFLAGS)
 
 linecount:
diff --git a/test/Makefile b/test/Makefile
index 6f6ffdd9de..9a81242a80 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,9 @@
-test:
-	perl ./runtest.pl all
+TESTS = $(sort $(patsubst %/,%.test,$(wildcard */)))
+
+test: $(TESTS)
+
+%.test:
+	@perl ./runtest.pl $(patsubst %.test,%,$@)
 
 test_java:
 	perl ./runtest.pl all --codegen Java
@@ -63,3 +67,5 @@ diff:
 distclean:
 	rm -f *~
 	rm -f */output
+
+.phony: test test_java test_js update diff distclean $(TESTS)
diff --git a/test/runtest.pl b/test/runtest.pl
index 1683719efd..3c8b3ca73b 100755
--- a/test/runtest.pl
+++ b/test/runtest.pl
@@ -9,7 +9,7 @@ sub runtest {
 
     chdir($test);
 
-    print "Running $test...";
+    print "Running $test...\n";
     $got = `sh ./run @idrOpts`;
     $exp = `cat expected`;
 
@@ -33,14 +33,14 @@ sub runtest {
     }
 
     if ($got eq $exp) {
-	print "success\n";
+	print "Ran $test...success\n";
     } else {
 	if ($update == 0) {
 	    $exitstatus = 1;
-	    print "FAILURE\n";
+	    print "Ran $test...FAILURE\n";
 	} else {
 	    system("cp output expected");
-	    print "UPDATED\n";
+	    print "Ran $test...UPDATED\n";
 	}
     }
     chdir("..");