Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 31b9d3c500e5550cc1127210f69a12736a26ab4d)
+++ tests/Makefile.am	(revision e173d3c3ffdc4e6c03286e459434076a3a6b7823)
@@ -54,5 +54,5 @@
 
 # adjust CC to current flags
-CC = LC_ALL=C $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS} ${AST_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS} ${AST_FLAGS})
+CC = LC_ALL=C $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS} ,$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS}
 CFACC = $(CC)
 
@@ -61,5 +61,5 @@
 
 # adjusted CC but without the actual distcc call
-CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) ${ARCH_FLAGS} ${AST_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS} ${AST_FLAGS})
+CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) ${ARCH_FLAGS} ,$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 CFACCLINK = $(CFACCLOCAL) -quiet $(if $(test), 2> $(test), ) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g'))
 
Index: tests/pybin/settings.py
===================================================================
--- tests/pybin/settings.py	(revision 31b9d3c500e5550cc1127210f69a12736a26ab4d)
+++ tests/pybin/settings.py	(revision e173d3c3ffdc4e6c03286e459434076a3a6b7823)
@@ -102,13 +102,13 @@
 			self.target = ast
 			self.string = "New AST"
-			self.flags  = """AST_FLAGS=-XCFA,--new-ast"""
+			self.flags  = """"""
 		elif ast == "old":
 			self.target = ast
 			self.string = "Old AST"
-			self.flags  = """AST_FLAGS=-XCFA,--old-ast"""
+			self.flags  = """"""
 		elif ast == None:
 			self.target = "new" if config.NEWAST else "old"
 			self.string = "Default AST (%s)" % self.target
-			self.flags  = """AST_FLAGS="""
+			self.flags  = """"""
 		else:
 			print("""ERROR: Invalid ast configuration, must be "old", "new" or left unspecified, was %s""" % (value), file=sys.stderr)
Index: tests/test.py
===================================================================
--- tests/test.py	(revision 31b9d3c500e5550cc1127210f69a12736a26ab4d)
+++ tests/test.py	(revision e173d3c3ffdc4e6c03286e459434076a3a6b7823)
@@ -351,5 +351,5 @@
 
 		# print the possible options
-		print("-h --help --debug --dry-run --list --ast=new --ast=old --arch --all --regenerate-expected --archive-errors --install --timeout --global-timeout --timeout-with-gdb -j --jobs -I --include -E --exclude --continue ", end='')
+		print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --archive-errors --install --timeout --global-timeout --timeout-with-gdb -j --jobs -I --include -E --exclude --continue ", end='')
 		print(" ".join(map(lambda t: "%s" % (t.target()), tests)))