diff --git a/Makefile b/Makefile
index 9431cfe0c450d6b5b0c434fe720ce028acfdf795..dad96af029ce16296cf34e4125e721b8be2afe28 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Some SCONS shortcuts
 #----------------------------------------------------------------------
 
-CONCURRENCY_LEVEL ?= 1
+CONCURRENCY_LEVEL ?= 2
 
 SCONS=scons -j $(CONCURRENCY_LEVEL)
 
@@ -16,6 +16,9 @@ clean:
 
 all_docs all_tests all:
 	$(SCONS) $@
+	
+%/test:
+	$(SCONS) $@
 
 #----------------------------------------------------------------------
 # Subversion stuff