Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 41af19c4fd05a6d608a489a8ef755e3005583223)
+++ tests/Makefile.am	(revision 721500032cac54e6e0140d924dd8656383adabc1)
@@ -41,4 +41,6 @@
 	-quiet @CFA_FLAGS@ \
 	-DIN_DIR="${abs_srcdir}/.in/"
+
+AM_CFAFLAGS = -XCFA --deterministic-out
 
 # get the desired cfa to test
Index: tests/Makefile.in
===================================================================
--- tests/Makefile.in	(revision 41af19c4fd05a6d608a489a8ef755e3005583223)
+++ tests/Makefile.in	(revision 721500032cac54e6e0140d924dd8656383adabc1)
@@ -408,4 +408,5 @@
 	-DIN_DIR="${abs_srcdir}/.in/"
 
+AM_CFAFLAGS = -XCFA --deterministic-out
 
 # get the desired cfa to test
Index: tests/errors/.expect/completeType.txt
===================================================================
--- tests/errors/.expect/completeType.txt	(revision 41af19c4fd05a6d608a489a8ef755e3005583223)
+++ tests/errors/.expect/completeType.txt	(revision 721500032cac54e6e0140d924dd8656383adabc1)
@@ -27,5 +27,5 @@
     void 
   )
-  Environment:( _85_4_DT ) -> instance of struct A with body 0 (no widening)
+  Environment: -> instance of struct A with body 0 (no widening)
 
 
@@ -50,5 +50,5 @@
     void 
   )
-  Environment:( _85_4_DT ) -> instance of struct B with body 1 (no widening)
+  Environment: -> instance of struct B with body 1 (no widening)
 
 
@@ -127,5 +127,5 @@
           void 
         )
-        Environment:( _104_0_T ) -> instance of type T (not function type) (no widening)
+        Environment: -> instance of type T (not function type) (no widening)
 
       Could not satisfy assertion: