Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision f85bc15883101cc8666be04202f70b30a32a52ff)
+++ src/tests/Makefile.am	(revision 552f5cb4b73c9ef7c7998db595343c3d9be437f6)
@@ -70,8 +70,4 @@
 	@+${TEST_PY} --debug=${debug} -Iconcurrent
 
-.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}				#don't use CFLAGS, this rule is not a real test
-
-
 % : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) -o ${@}
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision f85bc15883101cc8666be04202f70b30a32a52ff)
+++ src/tests/Makefile.in	(revision 552f5cb4b73c9ef7c7998db595343c3d9be437f6)
@@ -768,7 +768,4 @@
 	@+${TEST_PY} --debug=${debug} -Iconcurrent
 
-.dummy : .dummy.c @CFA_BINDIR@/@CFA_NAME@
-	${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}				#don't use CFLAGS, this rule is not a real test
-
 % : ${srcdir}/%.c @CFA_BINDIR@/@CFA_NAME@
 	${CC} ${AM_CFLAGS} ${CFLAGS} $(abspath ${<}) -o ${@}
Index: src/tests/config.py.in
===================================================================
--- src/tests/config.py.in	(revision f85bc15883101cc8666be04202f70b30a32a52ff)
+++ src/tests/config.py.in	(revision 552f5cb4b73c9ef7c7998db595343c3d9be437f6)
@@ -7,2 +7,3 @@
 SRCDIR   = "@srcdir@"
 BUILDDIR = "@builddir@"
+HOSTARCH = "@host_cpu@"
Index: src/tests/pybin/settings.py
===================================================================
--- src/tests/pybin/settings.py	(revision f85bc15883101cc8666be04202f70b30a32a52ff)
+++ src/tests/pybin/settings.py	(revision 552f5cb4b73c9ef7c7998db595343c3d9be437f6)
@@ -6,8 +6,8 @@
 try :
 	sys.path.append(os.getcwd())
-	from config import *
+	import config
 
-	SRCDIR = os.path.abspath(SRCDIR)
-	BUILDDIR = os.path.abspath(BUILDDIR)
+	SRCDIR = os.path.abspath(config.SRCDIR)
+	BUILDDIR = os.path.abspath(config.BUILDDIR)
 except:
 	print('ERROR: missing config.py, re-run configure script.', file=sys.stderr)
@@ -18,4 +18,5 @@
 		'x64'			: 'x64',
 		'x86-64'		: 'x64',
+		'x86_64'		: 'x64',
 		'x86'			: 'x86',
 		'i386'		: 'x86',
@@ -38,5 +39,5 @@
 			self.cross_compile = False
 			try:
-				arch = machine_default()
+				arch = config.HOSTARCH
 				self.target = Architecture.makeCanonical( arch )
 			except KeyError:
@@ -84,8 +85,2 @@
 
 	make = "make" if not force else ("make -j%i" % jobs)
-
-
-def set_machine_default( func ):
-	global machine_default
-
-	machine_default = func
Index: src/tests/pybin/tools.py
===================================================================
--- src/tests/pybin/tools.py	(revision f85bc15883101cc8666be04202f70b30a32a52ff)
+++ src/tests/pybin/tools.py	(revision 552f5cb4b73c9ef7c7998db595343c3d9be437f6)
@@ -170,25 +170,4 @@
 #               system
 ################################################################################
-
-# parses the Makefile to find the machine type (32-bit / 64-bit)
-def getMachineType():
-	sh('echo "void ?{}(int&a,int b){}int main(){return 0;}" > .dummy.c')
-	ret, out = make('.dummy', silent = True)
-
-	if ret != 0:
-		print("Failed to identify architecture:")
-		print(out)
-		print("Stopping")
-		rm( (".dummy.c",".dummy") )
-		sys.exit(1)
-
-	_, out = sh("file .dummy", print2stdout=False)
-	rm( (".dummy.c",".dummy") )
-
-	if settings.dry_run :
-		return 'x64'
-
-	return re.search(r"[^,]+,([^,]+),", out).group(1).strip()
-
 # count number of jobs to create
 def jobCount( options, tests ):
@@ -254,4 +233,2 @@
 	else:
 		print(text)
-
-settings.set_machine_default( getMachineType )