diff --git a/configure.ac b/configure.ac
index cc601d3c..94fab063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,7 @@ if test "$enable_gcc_warnings" = yes; then
   # ... possiby in std=c++11 mode.
   gl_WARN_ADD([-Wno-zero-as-null-pointer-constant], [FLEX_SCANNER_CXXFLAGS])
   CXXFLAGS=$save_CXXFLAGS
-  gl_WARN_ADD([-fno-exceptions], [CXXFLAGS_NO_EXCEPTIONS])
+  gl_WARN_ADD([-fno-exceptions], [NO_EXCEPTIONS_CXXFLAGS])
   # Clang++ deprecates compiling C.
   gl_WARN_ADD([-Wno-deprecated], [WNO_DEPRECATED_CXXFLAGS])
   AC_LANG_POP([C++])
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 00cb92c9..a0a91687 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -52,7 +52,7 @@ CXXFLAGS="$NO_WERROR_CXXFLAGS @WERROR_CXXFLAGS@"
 BISON_CXX_WORKS='@BISON_CXX_WORKS@'
 
 # Compiler flags to disable exception support.
-CXXFLAGS_NO_EXCEPTIONS='@CXXFLAGS_NO_EXCEPTIONS@'
+NO_EXCEPTIONS_CXXFLAGS='@NO_EXCEPTIONS_CXXFLAGS@'
 
 # Be sure that the C++ compiler is not broken because of gnulib.  This
 # cannot be checked in configure (gnulib is not parameterized yet),
diff --git a/tests/calc.at b/tests/calc.at
index acc27da2..a75a1bc6 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -681,7 +681,7 @@ m4_define([AT_CHECK_CALC_LALR1_CC],
 
 AT_CHECK_CALC_LALR1_CC([])
 AT_CHECK_CALC_LALR1_CC([%locations])
-AT_CHECK_CALC_LALR1_CC([%locations], [$CXXFLAGS_NO_EXCEPTIONS])
+AT_CHECK_CALC_LALR1_CC([%locations], [$NO_EXCEPTIONS_CXXFLAGS])
 AT_CHECK_CALC_LALR1_CC([%locations %define api.location.type {Span}])
 AT_CHECK_CALC_LALR1_CC([%defines %locations %define parse.error verbose %name-prefix "calc" %verbose %yacc])