diff --git a/clang-tools-extra/pseudo/test/cxx/capture-list.cpp b/clang-tools-extra/pseudo/test/cxx/capture-list.cpp
index 8659a6acae80..fde46e4f0e03 100644
--- a/clang-tools-extra/pseudo/test/cxx/capture-list.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/capture-list.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 // We loosely allow capture defaults in any position/multiple times.
 auto lambda = [&, &foo, bar(x), =]{};
 // CHECK:      lambda-introducer := [ capture-list ]
diff --git a/clang-tools-extra/pseudo/test/cxx/declarator-function.cpp b/clang-tools-extra/pseudo/test/cxx/declarator-function.cpp
index 0de4ec14ffcd..59dccf993af4 100644
--- a/clang-tools-extra/pseudo/test/cxx/declarator-function.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/declarator-function.cpp
@@ -4,7 +4,7 @@
 // FIXME: eliminate this false parse.
 // XFAIL: *
 
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 void s(){};
 // CHECK-NOT:      simple-declaration
 // CHECK:          function-definition := decl-specifier-seq declarator
diff --git a/clang-tools-extra/pseudo/test/cxx/declarator-var.cpp b/clang-tools-extra/pseudo/test/cxx/declarator-var.cpp
index a5adb43dc3c5..057ec55b1c92 100644
--- a/clang-tools-extra/pseudo/test/cxx/declarator-var.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/declarator-var.cpp
@@ -4,7 +4,7 @@
 // FIXME: eliminate this false parse.
 // XFAIL: *
 
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 void (*s)(){};
 // CHECK-NOT:      function-definition
 // CHECK:          init-declarator := declarator initializer
diff --git a/clang-tools-extra/pseudo/test/cxx/empty-member-spec.cpp b/clang-tools-extra/pseudo/test/cxx/empty-member-spec.cpp
index 6d7a6823d0bf..e6dbbddf0906 100644
--- a/clang-tools-extra/pseudo/test/cxx/empty-member-spec.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/empty-member-spec.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 class Foo {
 public:
 };
diff --git a/clang-tools-extra/pseudo/test/cxx/keyword.cpp b/clang-tools-extra/pseudo/test/cxx/keyword.cpp
index b58c250c763f..318db4ccc49b 100644
--- a/clang-tools-extra/pseudo/test/cxx/keyword.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/keyword.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 bool operator<();
 // CHECK:      translation-unit~simple-declaration := decl-specifier-seq init-declarator-list ;
 // CHECK-NEXT: ├─decl-specifier-seq~BOOL
diff --git a/clang-tools-extra/pseudo/test/cxx/mixed-designator.cpp b/clang-tools-extra/pseudo/test/cxx/mixed-designator.cpp
index ec568390ffff..5a89f4d57a52 100644
--- a/clang-tools-extra/pseudo/test/cxx/mixed-designator.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/mixed-designator.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 // FIXME: tighten CHECK to CHECK-NEXT once numeric literals are unambiguous.
 auto x = { 1, .f = 2, [c]{3} };
 // CHECK:      initializer-clause~braced-init-list
diff --git a/clang-tools-extra/pseudo/test/cxx/parameter-decl-clause.cpp b/clang-tools-extra/pseudo/test/cxx/parameter-decl-clause.cpp
index 7de65687e1d1..18584ded9b5b 100644
--- a/clang-tools-extra/pseudo/test/cxx/parameter-decl-clause.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/parameter-decl-clause.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 void foo2(int, ...);
 // CHECK:      translation-unit~simple-declaration := decl-specifier-seq init-declarator-list ;
 // CHECK-NEXT: ├─decl-specifier-seq~VOID :=
diff --git a/clang-tools-extra/pseudo/test/cxx/predefined-identifier.cpp b/clang-tools-extra/pseudo/test/cxx/predefined-identifier.cpp
index 1a05672835a7..5d48a3a43d02 100644
--- a/clang-tools-extra/pseudo/test/cxx/predefined-identifier.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/predefined-identifier.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 void s() {
   __func__;
   // CHECK: expression~__FUNC__ := tok[5]
diff --git a/clang-tools-extra/pseudo/test/cxx/template-empty-type-parameter.cpp b/clang-tools-extra/pseudo/test/cxx/template-empty-type-parameter.cpp
index e8f48c64d79f..02aff285f838 100644
--- a/clang-tools-extra/pseudo/test/cxx/template-empty-type-parameter.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/template-empty-type-parameter.cpp
@@ -1,3 +1,3 @@
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 template <typename> struct MatchParents;
 // CHECK: template-parameter-list~TYPENAME := tok[2]
diff --git a/clang-tools-extra/pseudo/test/cxx/unsized-array.cpp b/clang-tools-extra/pseudo/test/cxx/unsized-array.cpp
index 52179e0e2dd4..1f7b106e0e93 100644
--- a/clang-tools-extra/pseudo/test/cxx/unsized-array.cpp
+++ b/clang-tools-extra/pseudo/test/cxx/unsized-array.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-pseudo -grammar=%cxx-bnf-file -source=%s --print-forest | FileCheck %s
+// RUN: clang-pseudo -grammar=cxx -source=%s --print-forest | FileCheck %s
 void s(int[]);
 // CHECK:      parameter-declaration-clause~parameter-declaration := decl-specifier-seq abstract-declarator
 // CHECK-NEXT: ├─decl-specifier-seq~INT := tok[3]