diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 917ba23975fe..e0cc2a670a1d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,14 @@
 2016-01-08  Jonathan Wakely  <jwakely@redhat.com>
 
+	* testsuite/26_numerics/headers/cmath/
+	c99_classification_macros_c++.cc: Rename to ...
+	* testsuite/26_numerics/headers/cmath/
+	c99_classification_macros_c++98.cc: Here and add -std=gnu++98.
+	* testsuite/26_numerics/headers/cmath/
+	c99_classification_macros_c++0x.cc: Rename to ...
+	* testsuite/26_numerics/headers/cmath/
+	c99_classification_macros_c++11.cc: Here.
+
 	PR libstdc++/69190
 	* include/bits/uses_allocator.h: Add missing include.
 
diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++0x.cc b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++11.cc
similarity index 100%
rename from libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++0x.cc
rename to libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++11.cc
diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++.cc b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++98.cc
similarity index 98%
rename from libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++.cc
rename to libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++98.cc
index 6e81b6813ae7..4c4cc4e85b87 100644
--- a/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++.cc
+++ b/libstdc++-v3/testsuite/26_numerics/headers/cmath/c99_classification_macros_c++98.cc
@@ -17,7 +17,7 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-
+// { dg-options "-std=gnu++98" }
 // { dg-do compile { xfail uclibc } }
 // { dg-excess-errors "" { target uclibc } }