diff --git test/Lexer/cxx0x_keyword_as_cxx98.cpp test/Lexer/cxx0x_keyword_as_cxx98.cpp
index 5d16810..8f5fcf4 100644
--- test/Lexer/cxx0x_keyword_as_cxx98.cpp
+++ test/Lexer/cxx0x_keyword_as_cxx98.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 %s -verify -fsyntax-only -Wc++11-compat 
+// RUN: %clang_cc1 %s -verify -fsyntax-only -Wc++11-compat -std=c++98
 
 #define constexpr const
 constexpr int x = 0;
diff --git test/Lexer/has_feature_cxx0x.cpp test/Lexer/has_feature_cxx0x.cpp
index dbb650e..8c7ff18 100644
--- test/Lexer/has_feature_cxx0x.cpp
+++ test/Lexer/has_feature_cxx0x.cpp
@@ -1,6 +1,6 @@
 // RUN: %clang_cc1 -E -triple x86_64-linux-gnu -std=c++11 %s -o - | FileCheck --check-prefix=CHECK-11 %s
 // RUN: %clang_cc1 -E -triple armv7-apple-darwin -std=c++11 %s -o - | FileCheck --check-prefix=CHECK-NO-TLS %s
-// RUN: %clang_cc1 -E -triple x86_64-linux-gnu %s -o - | FileCheck --check-prefix=CHECK-NO-11 %s
+// RUN: %clang_cc1 -E -triple x86_64-linux-gnu -std=c++98 %s -o - | FileCheck --check-prefix=CHECK-NO-11 %s
 // RUN: %clang_cc1 -E -triple x86_64-linux-gnu -std=c++14 %s -o - | FileCheck --check-prefix=CHECK-14 %s
 // RUN: %clang_cc1 -E -triple x86_64-linux-gnu -std=c++1z %s -o - | FileCheck --check-prefix=CHECK-1Z %s
 
diff --git test/Lexer/ms-extensions.cpp test/Lexer/ms-extensions.cpp
index 7e18a6c..9a858a4 100644
--- test/Lexer/ms-extensions.cpp
+++ test/Lexer/ms-extensions.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -Wreserved-user-defined-literal -fms-extensions -fms-compatibility %s
+// RUN: %clang_cc1 -fsyntax-only -verify -Wreserved-user-defined-literal -fms-extensions -fms-compatibility -std=c++98 %s
 
 #define bar(x) #x
 const char * f() {
diff --git test/Preprocessor/macro-reserved-cxx11.cpp test/Preprocessor/macro-reserved-cxx11.cpp
index a740ff6..6daea95 100644
--- test/Preprocessor/macro-reserved-cxx11.cpp
+++ test/Preprocessor/macro-reserved-cxx11.cpp
@@ -1,4 +1,5 @@
 // RUN: %clang_cc1 -fsyntax-only -std=c++11 -pedantic -verify %s
+// RUN: %clang_cc1 -fsyntax-only -std=c++14 -pedantic -verify %s
 
 #define for 0    // expected-warning {{keyword is hidden by macro definition}}
 #define final 1  // expected-warning {{keyword is hidden by macro definition}}
diff --git test/Preprocessor/macro-reserved.cpp test/Preprocessor/macro-reserved.cpp
index ba1594a..d1f7031 100644
--- test/Preprocessor/macro-reserved.cpp
+++ test/Preprocessor/macro-reserved.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -std=c++98 %s
 
 #define for 0    // expected-warning {{keyword is hidden by macro definition}}
 #define final 1