Index: test-suite/trunk/External/SPEC/CFP2017rate/510.parest_r/CMakeLists.txt
===================================================================
--- test-suite/trunk/External/SPEC/CFP2017rate/510.parest_r/CMakeLists.txt
+++ test-suite/trunk/External/SPEC/CFP2017rate/510.parest_r/CMakeLists.txt
@@ -267,3 +267,4 @@
   source/libparest/slave/stationary/state_discretization.cc
   source/libparest/slave/stationary/synthetic_data.cc
 )
+set_property(TARGET ${PROG} PROPERTY CXX_STANDARD 98)
Index: test-suite/trunk/External/SPEC/CFP2017rate/526.blender_r/CMakeLists.txt
===================================================================
--- test-suite/trunk/External/SPEC/CFP2017rate/526.blender_r/CMakeLists.txt
+++ test-suite/trunk/External/SPEC/CFP2017rate/526.blender_r/CMakeLists.txt
@@ -1206,4 +1206,5 @@
   specrand/specrand.c
   spec_backtrace.c
 )
+set_property(TARGET ${PROG} PROPERTY CXX_STANDARD 98)
 speccpu2017_prepare_rundir()
Index: test-suite/trunk/External/SPEC/CINT2006/473.astar/CMakeLists.txt
===================================================================
--- test-suite/trunk/External/SPEC/CINT2006/473.astar/CMakeLists.txt
+++ test-suite/trunk/External/SPEC/CINT2006/473.astar/CMakeLists.txt
@@ -1,3 +1,5 @@
+list(APPEND CPPFLAGS -std=c++98)
+
 macro(test_input run_type input output)
   llvm_test_run(RUN_TYPE ${run_type}
     ${input}