Index: test/Lexer/clang-keywords.cpp
===================================================================
--- test/Lexer/clang-keywords.cpp
+++ test/Lexer/clang-keywords.cpp
@@ -1,4 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -verify %s
-// expected-no-diagnostics
-__char16_t c16;
-void f(__char32_t) { }
Index: test/Lexer/cxx0x_keyword.cpp
===================================================================
--- test/Lexer/cxx0x_keyword.cpp
+++ test/Lexer/cxx0x_keyword.cpp
@@ -1,2 +0,0 @@
-// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s 2>&1
-int static_assert; /* expected-error {{expected unqualified-id}} */
Index: test/Lexer/gnu_keywords.c
===================================================================
--- test/Lexer/gnu_keywords.c
+++ test/Lexer/gnu_keywords.c
@@ -1,13 +0,0 @@
-// RUN: %clang_cc1 -DGNU_KEYWORDS -std=gnu89 -fsyntax-only -verify %s
-// RUN: %clang_cc1 -DGNU_KEYWORDS -std=c99 -fgnu-keywords -fsyntax-only -verify %s
-// RUN: %clang_cc1 -std=c99 -fsyntax-only -verify %s
-// RUN: %clang_cc1 -std=gnu89 -fno-gnu-keywords -fsyntax-only -verify %s
-// expected-no-diagnostics
-
-void f() {
-#ifdef GNU_KEYWORDS
-  asm ("ret" : :);
-#else
-  int asm;
-#endif
-}
Index: test/Lexer/keywords_test.cpp
===================================================================
--- test/Lexer/keywords_test.cpp
+++ test/Lexer/keywords_test.cpp
@@ -0,0 +1,32 @@
+// RUN: %clang_cc1 -std=c++03 -fsyntax-only %s
+// RUN: %clang_cc1 -std=c++11 -DCXX11 -fsyntax-only %s
+
+// C++ keywords
+#ifdef CXX11
+  _Static_assert(!__is_identifier(nullptr), "nullptr");
+  _Static_assert(!__is_identifier(decltype), "decltype");
+  _Static_assert(!__is_identifier(alignof), "alignof");
+  _Static_assert(!__is_identifier(alignas), "alignas");
+  _Static_assert(!__is_identifier(char16_t), "char16_t");
+  _Static_assert(!__is_identifier(char32_t), "char32_t");
+  _Static_assert(!__is_identifier(constexpr), "constexpr");
+  _Static_assert(!__is_identifier(noexcept), "noexcept");
+  _Static_assert(!__is_identifier(static_assert), "static_assert");
+  _Static_assert(!__is_identifier(thread_local), "thread_local");
+#else
+  _Static_assert(__is_identifier(nullptr), "nullptr");
+  _Static_assert(__is_identifier(decltype), "decltype");
+  _Static_assert(__is_identifier(alignof), "alignof");
+  _Static_assert(__is_identifier(alignas), "alignas");
+  _Static_assert(__is_identifier(char16_t), "char16_t");
+  _Static_assert(__is_identifier(char32_t), "char32_t");
+  _Static_assert(__is_identifier(constexpr), "constexpr");
+  _Static_assert(__is_identifier(noexcept), "noexcept");
+  _Static_assert(__is_identifier(static_assert), "static_assert");
+  _Static_assert(__is_identifier(thread_local), "thread_local");
+#endif
+
+// Clang extension
+_Static_assert(!__is_identifier(__char16_t), "__char16_t");
+_Static_assert(!__is_identifier(__char32_t), "__char32_t");
+