Index: src/tests/pybin/settings.py
===================================================================
--- src/tests/pybin/settings.py	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
+++ src/tests/pybin/settings.py	(revision 209383b99b1af12a23596f0f80bfb1394bcd3e06)
@@ -17,4 +17,6 @@
 	global generating
 	global make
+	global debug
+	global debugFlag
 
 	arch       = Architecture(options.arch)
@@ -22,4 +24,6 @@
 	generating = options.regenerate_expected
 	make       = './make_command_not_initialized'
+	debug	     = "debug" if options.debug else "no debug"
+	debugFlag  = """DEBUG_FLAGS="%s" """ % ("-debug" if debug else "-nodebug")
 
 def updateMakeCmd(force, jobs):
Index: src/tests/pybin/tools.py
===================================================================
--- src/tests/pybin/tools.py	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
+++ src/tests/pybin/tools.py	(revision 209383b99b1af12a23596f0f80bfb1394bcd3e06)
@@ -76,4 +76,5 @@
 		'-s' if silent else '',
 		test_param,
+		settings.debugFlag,
 		flags,
 		target,
Index: src/tests/test.py
===================================================================
--- src/tests/test.py	(revision bacc36ce667997c9f0ed8001bf0911d0fe811ee1)
+++ src/tests/test.py	(revision 209383b99b1af12a23596f0f80bfb1394bcd3e06)
@@ -7,5 +7,4 @@
 
 import argparse
-import functools
 import re
 import sys
@@ -15,5 +14,5 @@
 ################################################################################
 
-def list_expected():
+def findTests():
 	expected = []
 
@@ -37,5 +36,5 @@
 
 	# tests directly in the .expect folder will always be processed
-	test_list = list_expected()
+	test_list = findTests()
 
 	# if we have a limited number of includes, filter by them
@@ -120,5 +119,5 @@
 ################################################################################
 # logic to run a single test and return the result (No handling of printing or other test framework logic)
-def run_single_test(test, debug):
+def run_single_test(test):
 
 	# find the output file based on the test name and options flag
@@ -134,9 +133,6 @@
 	rm( (out_file, err_file, test.target()) )
 
-	options = "-debug" if debug else "-nodebug"
-
 	# build, skipping to next test on error
 	make_ret, _ = make( test.target(),
-		flags      = """DEBUG_FLAGS="%s" """ % options,
 		redirects  = "2> %s 1> /dev/null" % out_file,
 		error_file = err_file
@@ -180,5 +176,5 @@
 
 # run a single test and handle the errors, outputs, printing, exception handling, etc.
-def run_test_worker(t, debug) :
+def run_test_worker(t) :
 
 	with SignalHandling():
@@ -186,5 +182,5 @@
 		name_txt = "%20s  " % t.name
 
-		retcode, error = run_single_test(t, debug)
+		retcode, error = run_single_test(t)
 
 		# update output based on current action
@@ -205,5 +201,5 @@
 
 # run the given list of tests with the given parameters
-def run_tests(tests, jobs, debug) :
+def run_tests(tests, jobs) :
 	# clean the sandbox from previous commands
 	make('clean', redirects = '> /dev/null 2>&1')
@@ -215,5 +211,5 @@
 	try :
 		results = pool.map_async(
-			functools.partial(run_test_worker, debug=debug),
+			run_test_worker,
 			tests,
 			chunksize = 1
@@ -267,5 +263,5 @@
 
 	elif options.list :
-		print("Listing for %s:%s"% (settings.arch.toString(), "debug" if options.debug else "no debug"))
+		print("Listing for %s:%s"% (settings.arch.toString(), settings.debug))
 		print("\n".join(map(lambda t: "%s" % (t.toString()), tests)))
 
@@ -277,8 +273,8 @@
 			'Regenerate tests' if settings.generating else 'Running',
 			settings.arch.toString(),
-			"debug" if options.debug else "no debug",
+			settings.debug,
 			options.jobs
 		))
 
 		# otherwise run all tests and make sure to return the correct error code
-		sys.exit( run_tests(tests, options.jobs, options.debug) )
+		sys.exit( run_tests(tests, options.jobs) )