Index: src/driver/cfa.cc
===================================================================
--- src/driver/cfa.cc	(revision 159c62e3d89127174a09e128af55cc1c5f94a010)
+++ src/driver/cfa.cc	(revision 9bb81bb80fd3a7fe20685490367fe3d691093c5a)
@@ -5,5 +5,5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// cfa.cc -- 
+// cfa.cc --
 //
 // Author           : Peter A. Buhr
@@ -249,4 +249,7 @@
 	nargs += 1;
 
+	args[nargs] = "-I" CFA_INCDIR "/containers";
+	nargs += 1;
+
 	if ( link ) {
 		// include the cfa library in case it's needed
@@ -308,5 +311,5 @@
 		args[nargs] = "-no-integrated-cpp";
 		nargs += 1;
-		args[nargs] = "-Wno-deprecated"; 
+		args[nargs] = "-Wno-deprecated";
 		nargs += 1;
 		if ( ! std_flag ) {								// default c99, if none specified
@@ -314,5 +317,5 @@
 			nargs += 1;
 		} // if
-		args[nargs] = "-fgnu89-inline"; 
+		args[nargs] = "-fgnu89-inline";
 		nargs += 1;
 		args[nargs] = ( *new string( string("-B") + Bprefix + "/" ) ).c_str();
Index: src/tests/test.py
===================================================================
--- src/tests/test.py	(revision 159c62e3d89127174a09e128af55cc1c5f94a010)
+++ src/tests/test.py	(revision 9bb81bb80fd3a7fe20685490367fe3d691093c5a)
@@ -9,4 +9,5 @@
 import os
 import re
+import stat
 import sys
 
@@ -60,4 +61,13 @@
 		return result;
 
+def fileIsExecutable(file) :
+	try :
+		fileinfo = os.stat(file)
+		return bool(fileinfo.st_mode & stat.S_IXUSR)
+	except Exception as inst:
+		print(type(inst))    # the exception instance
+		print(inst.args)     # arguments stored in .args
+		print(inst)
+		return False
 
 ################################################################################
@@ -78,6 +88,10 @@
 		stdinput = "< .in/%s.txt" % test if isfile(".in/%s.txt" % test) else ""
 
-		# run test
-		sh("./%s %s > %s 2>&1" % (test, stdinput, out_file), dry_run)
+		if fileIsExecutable(test) :
+			# run test
+			sh("./%s %s > %s 2>&1" % (test, stdinput, out_file), dry_run)
+		else :
+			# simply cat the result into the output
+			sh("cat %s > %s" % (test, out_file), dry_run)
 
 	retcode = 0