Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision a62cbb3af359e75700b6d8cf6f0e0229abd0c0d5)
+++ src/tests/Makefile.am	(revision bf8da6606c2fc3df924eb158f0fd5cc39f7be465)
@@ -40,5 +40,5 @@
 
 all-local :
-	@+python test.py ${quick_test}
+	@+python test.py --debug=${debug} --concurrent=${concurrent} ${quick_test}
 
 all-tests :
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision a62cbb3af359e75700b6d8cf6f0e0229abd0c0d5)
+++ src/tests/Makefile.in	(revision bf8da6606c2fc3df924eb158f0fd5cc39f7be465)
@@ -657,5 +657,5 @@
 
 all-local :
-	@+python test.py ${quick_test}
+	@+python test.py --debug=${debug} --concurrent=${concurrent} ${quick_test}
 
 all-tests :
Index: src/tests/test.py
===================================================================
--- src/tests/test.py	(revision a62cbb3af359e75700b6d8cf6f0e0229abd0c0d5)
+++ src/tests/test.py	(revision bf8da6606c2fc3df924eb158f0fd5cc39f7be465)
@@ -33,8 +33,9 @@
 
 def listTestsFolder(folder) :
-	path = ('./.expect/%s' % folder) if folder else './expect'
+	path = ('./.expect/%s/' % folder) if folder else './.expect/'
+	subpath = "%s/" % folder if folder else ""
 
 	# tests directly in the .expect folder will always be processed
-	return map(lambda fname: Test(fname, '%s/%s' % (path, fname)),
+	return map(lambda fname: Test(fname, subpath + fname),
 		[splitext(f)[0] for f in listdir( path )
 		if not f.startswith('.') and f.endswith('.txt')
@@ -46,5 +47,5 @@
 
 	# tests directly in the .expect folder will always be processed
-	generic_list = listTestsFolder( "." )
+	generic_list = listTestsFolder( "" )
 
 	# tests in the machineType folder will be ran only for the corresponding compiler