Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision 00303d504fd31623252532e4fd77e5294086917b)
+++ src/tests/Makefile.am	(revision 47f942244188da911b9356d8220e028c99613c0c)
@@ -29,5 +29,6 @@
 # applies to both programs
 EXTRA_FLAGS =
-CFLAGS = 2> .err/${@}.log -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+CFLAGS = 2> .err/${@}.log ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
 
@@ -52,5 +53,5 @@
 
 .dummy : .dummy.c
-	${CC} ${CFLAGS} -XCFA -n ${<} -o ${@}
+	${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}				#don't use CFLAGS, this rule is not a real test
 
 constant0-1DP : constant0-1.c
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision 00303d504fd31623252532e4fd77e5294086917b)
+++ src/tests/Makefile.in	(revision 47f942244188da911b9356d8220e028c99613c0c)
@@ -125,5 +125,5 @@
 CFA_NAME = @CFA_NAME@
 CFA_PREFIX = @CFA_PREFIX@
-CFLAGS = 2> .err/${@}.log -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+CFLAGS = 2> .err/${@}.log ${BUILD_FLAGS}
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -232,4 +232,5 @@
 # applies to both programs
 EXTRA_FLAGS = 
+BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
 fstream_test_SOURCES = fstream_test.c
 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
@@ -670,5 +671,5 @@
 
 .dummy : .dummy.c
-	${CC} ${CFLAGS} -XCFA -n ${<} -o ${@}
+	${CC} ${BUILD_FLAGS} -XCFA -n ${<} -o ${@}				#don't use CFLAGS, this rule is not a real test
 
 constant0-1DP : constant0-1.c
Index: src/tests/test.py
===================================================================
--- src/tests/test.py	(revision 00303d504fd31623252532e4fd77e5294086917b)
+++ src/tests/test.py	(revision 47f942244188da911b9356d8220e028c99613c0c)
@@ -29,5 +29,8 @@
 	ret, out = sh("make .dummy", print2stdout=False)
 	if ret != 0:
+		print("Failed to identify architecture:")
 		print(out)
+		print("Stopping")
+		sys.exit(1)
 	_, out = sh("file .dummy", print2stdout=False)
 	sh("rm -f .dummy.c > /dev/null 2>&1")