diff --git a/clang/test/OpenMP/driver-fopenmp-extensions.c b/clang/test/OpenMP/driver-fopenmp-extensions.c
deleted file mode 100644
--- a/clang/test/OpenMP/driver-fopenmp-extensions.c
+++ /dev/null
@@ -1,26 +0,0 @@
-// RUN: %clang -c -Xclang -verify=ompx -fopenmp %s
-// RUN: %clang -c -Xclang -verify=ompx -fopenmp-simd %s
-
-// RUN: %clang -c -Xclang -verify=ompx -fopenmp -fopenmp-extensions %s
-// RUN: %clang -c -Xclang -verify=ompx -fopenmp-simd -fopenmp-extensions %s
-
-// RUN: %clang -c -Xclang -verify=omp -fopenmp -fno-openmp-extensions %s
-// RUN: %clang -c -Xclang -verify=omp -fopenmp-simd -fno-openmp-extensions %s
-
-// RUN: %clang -c -Xclang -verify=omp -fopenmp \
-// RUN:     -fopenmp-extensions -fno-openmp-extensions %s
-// RUN: %clang -c -Xclang -verify=omp -fopenmp-simd \
-// RUN:     -fopenmp-extensions -fno-openmp-extensions %s
-
-// RUN: %clang -c -Xclang -verify=ompx -fopenmp \
-// RUN:     -fno-openmp-extensions -fopenmp-extensions %s
-// RUN: %clang -c -Xclang -verify=ompx -fopenmp-simd \
-// RUN:     -fno-openmp-extensions -fopenmp-extensions %s
-
-void foo() {
-  int x;
-  // ompx-no-diagnostics
-  // omp-error@+1 {{incorrect map type modifier}}
-  #pragma omp target map(ompx_hold, alloc: x)
-  ;
-}
diff --git a/clang/test/OpenMP/fopenmp-extensions.c b/clang/test/OpenMP/fopenmp-extensions.c
new file mode 100644
--- /dev/null
+++ b/clang/test/OpenMP/fopenmp-extensions.c
@@ -0,0 +1,26 @@
+// RUN: %clang_cc1 -verify=ompx -fopenmp %s
+// RUN: %clang_cc1 -verify=ompx -fopenmp-simd %s
+
+// RUN: %clang_cc1 -verify=ompx -fopenmp -fopenmp-extensions %s
+// RUN: %clang_cc1 -verify=ompx -fopenmp-simd -fopenmp-extensions %s
+
+// RUN: %clang_cc1 -verify=omp -fopenmp -fno-openmp-extensions %s
+// RUN: %clang_cc1 -verify=omp -fopenmp-simd -fno-openmp-extensions %s
+
+// RUN: %clang_cc1 -verify=omp -fopenmp \
+// RUN:     -fopenmp-extensions -fno-openmp-extensions %s
+// RUN: %clang_cc1 -verify=omp -fopenmp-simd \
+// RUN:     -fopenmp-extensions -fno-openmp-extensions %s
+
+// RUN: %clang_cc1 -verify=ompx -fopenmp \
+// RUN:     -fno-openmp-extensions -fopenmp-extensions %s
+// RUN: %clang_cc1 -verify=ompx -fopenmp-simd \
+// RUN:     -fno-openmp-extensions -fopenmp-extensions %s
+
+void foo() {
+  int x;
+  // ompx-no-diagnostics
+  // omp-error@+1 {{incorrect map type modifier}}
+  #pragma omp target map(ompx_hold, alloc: x)
+  ;
+}