Index: src/tests/test.py
===================================================================
--- src/tests/test.py	(revision d5b904db7e6d6850d3d094efb7a7041baee7ae02)
+++ src/tests/test.py	(revision 7bd045d5cd87cfb5349b87a36b1a6619fc586aac)
@@ -61,5 +61,5 @@
 
 	# build, skipping to next test on error
-	make_ret = sh("%s -j 8 %s 2> %s 1> /dev/null" % (make_cmd, test, out_file), dry_run)
+	make_ret = sh("%s %s 2> %s 1> /dev/null" % (make_cmd, test, out_file), dry_run)
 
 	if make_ret == 0 :
@@ -142,6 +142,6 @@
 
 tests.sort()
-
-make_cmd = "$(MAKE)" if environ.get('MAKELEVEL') else "make"
+make_flags = environ.get('MAKEFLAGS')
+make_cmd = "make" if make_flags and "-j" in make_flags else "make -j8"
 
 if options.list :