Index: tests/.expect/array.txt
===================================================================
--- tests/.expect/array.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/array.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 array.cfa: In function '_X4mainFi___1':
 array.cfa:54:9: note: #pragma message: Compiled
-   54 | 
-      |         ^      
Index: tests/.expect/forall.txt
===================================================================
--- tests/.expect/forall.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/forall.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 forall.cfa: In function '_X4mainFi___1':
 forall.cfa:218:9: note: #pragma message: Compiled
-  218 | 
-      |         ^      
Index: tests/.expect/identFuncDeclarator.txt
===================================================================
--- tests/.expect/identFuncDeclarator.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/identFuncDeclarator.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 identFuncDeclarator.cfa: In function '_X4mainFi___1':
 identFuncDeclarator.cfa:116:9: note: #pragma message: Compiled
-  116 | 
-      |         ^      
Index: tests/.expect/labelledExit.txt
===================================================================
--- tests/.expect/labelledExit.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/labelledExit.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 labelledExit.cfa: In function '_X4mainFi_iPPKc__1':
 labelledExit.cfa:183:9: note: #pragma message: Compiled
-  183 | 
-      |         ^      
Index: tests/.expect/limits.txt
===================================================================
--- tests/.expect/limits.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/limits.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 limits.cfa: In function '_X4mainFi_iPPKc__1':
 limits.cfa:151:9: note: #pragma message: Compiled
-  151 | 
-      |         ^      
Index: tests/.expect/nested-types.txt
===================================================================
--- tests/.expect/nested-types.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/nested-types.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 nested-types.cfa: In function '_X4mainFi___1':
 nested-types.cfa:102:9: note: #pragma message: Compiled
-  102 | 
-      |         ^      
Index: tests/.expect/numericConstants.txt
===================================================================
--- tests/.expect/numericConstants.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/numericConstants.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 numericConstants.cfa: In function '_X4mainFi___1':
 numericConstants.cfa:68:9: note: #pragma message: Compiled
-   68 | 
-      |         ^      
Index: tests/.expect/stdincludes.txt
===================================================================
--- tests/.expect/stdincludes.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/stdincludes.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 stdincludes.cfa: In function '_X4mainFi___1':
 stdincludes.cfa:52:9: note: #pragma message: Compiled
-   52 | 
-      |         ^      
Index: tests/.expect/switch.txt
===================================================================
--- tests/.expect/switch.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/switch.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 switch.cfa: In function '_X4mainFi___1':
 switch.cfa:105:9: note: #pragma message: Compiled
-  105 | 
-      |         ^      
Index: tests/.expect/variableDeclarator.txt
===================================================================
--- tests/.expect/variableDeclarator.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/.expect/variableDeclarator.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -1,4 +1,2 @@
 variableDeclarator.cfa: In function '_X4mainFi_iPPKc__1':
 variableDeclarator.cfa:182:9: note: #pragma message: Compiled
-  182 | 
-      |         ^      
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/Makefile.am	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -40,4 +40,5 @@
 	-fdebug-prefix-map=$(abspath ${abs_srcdir})= \
 	-fdebug-prefix-map=/tmp= \
+	-fno-diagnostics-show-caret \
 	-g \
 	-Wall \
@@ -52,5 +53,5 @@
 
 # adjust CC to current flags
-CC = $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
+CC = LC_ALL=en_US.ascii $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 CFACC = $(CC)
 
Index: tests/warnings/.expect/self-assignment.txt
===================================================================
--- tests/warnings/.expect/self-assignment.txt	(revision 66812dd99f2cc97ee7d08f95d6b009fa64a41a6b)
+++ tests/warnings/.expect/self-assignment.txt	(revision 0a19c51d3657fc94cf13791d5f9b948a7ed41d14)
@@ -26,4 +26,2 @@
 warnings/self-assignment.cfa: In function '_X4mainFi___1':
 warnings/self-assignment.cfa:36:9: note: #pragma message: Compiled
-   36 | 
-      |         ^