diff --git a/tests/c++.at b/tests/c++.at
index cd71595c..25f489e8 100644
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -19,11 +19,11 @@
 AT_BANNER([[C++ Features.]])
 
 
-## --------------- ##
-## C++ Locations.  ##
-## --------------- ##
+## -------------------------- ##
+## C++ Locations Unit Tests.  ##
+## -------------------------- ##
 
-AT_SETUP([C++ Locations])
+AT_SETUP([C++ Locations Unit Tests])
 
 AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "lalr1.cc"])
 AT_DATA_GRAMMAR([[input.y]],
@@ -185,6 +185,8 @@ AT_CLEANUP
 m4_pushdef([AT_TEST],
 [AT_SETUP([Variants $1])
 
+AT_KEYWORDS([variant])
+
 AT_BISON_OPTION_PUSHDEFS([%debug $1])
 # Store strings and integers in a vector of strings.
 AT_DATA_GRAMMAR([list.y],
@@ -375,7 +377,7 @@ AT_BISON_OPTION_POPDEFS
 AT_CLEANUP
 ])
 
-AT_TEST([[%skeleton "lalr1.cc" ]])
+AT_TEST([[%skeleton "lalr1.cc"]])
 AT_TEST([[%skeleton "lalr1.cc" %define parse.assert]])
 AT_TEST([[%skeleton "lalr1.cc" %define parse.assert %locations]])
 AT_TEST([[%skeleton "lalr1.cc" %define parse.assert %code {\n#define TWO_STAGE_BUILD\n}]])
diff --git a/tests/local.at b/tests/local.at
index 35c5f395..b1bdb4da 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -750,12 +750,12 @@ m4_define([AT_QUELL_VALGRIND],
 m4_define([AT_COMPILE],
 [AT_CHECK([$BISON_C_WORKS], 0, ignore, ignore)
 AT_CHECK(m4_join([ ],
-                  [$CC $CFLAGS $CPPFLAGS],
-                  [m4_bmatch([$1], [[.]], [-c], [$LDFLAGS])],
-                  [-o $1],
-                  [m4_default([$2], [m4_bpatsubst([$1], [\.o$]).c])],
-                  [m4_bmatch([$1], [[.]], [], [$LIBS])]),
-           0, [ignore], [ignore])])
+                 [$CC $CFLAGS $CPPFLAGS $3],
+                 [m4_bmatch([$1], [[.]], [-c], [$LDFLAGS])],
+                 [-o $1],
+                 [m4_default([$2], [m4_bpatsubst([$1], [\.o$]).c])],
+                 [m4_bmatch([$1], [[.]], [], [$LIBS])]),
+         0, [ignore], [ignore])])
 
 
 # AT_COMPILE_CXX(OUTPUT, [SOURCES = OUTPUT.cc])