diff --git a/clang/test/Driver/flink-huge-device-code.cpp b/clang/test/Driver/sycl-flink-huge-device-code.cpp
similarity index 100%
rename from clang/test/Driver/flink-huge-device-code.cpp
rename to clang/test/Driver/sycl-flink-huge-device-code.cpp
diff --git a/clang/test/Driver/fsyclbin.cpp b/clang/test/Driver/sycl-fsyclbin.cpp
similarity index 100%
rename from clang/test/Driver/fsyclbin.cpp
rename to clang/test/Driver/sycl-fsyclbin.cpp
diff --git a/clang/test/Driver/ftarget-compile-fast-old-model.cpp b/clang/test/Driver/sycl-ftarget-compile-fast-old-model.cpp
similarity index 100%
rename from clang/test/Driver/ftarget-compile-fast-old-model.cpp
rename to clang/test/Driver/sycl-ftarget-compile-fast-old-model.cpp
diff --git a/clang/test/Driver/ftarget-compile-fast.cpp b/clang/test/Driver/sycl-ftarget-compile-fast.cpp
similarity index 100%
rename from clang/test/Driver/ftarget-compile-fast.cpp
rename to clang/test/Driver/sycl-ftarget-compile-fast.cpp
diff --git a/clang/test/Driver/ftarget-export-symbols.cpp b/clang/test/Driver/sycl-ftarget-export-symbols.cpp
similarity index 100%
rename from clang/test/Driver/ftarget-export-symbols.cpp
rename to clang/test/Driver/sycl-ftarget-export-symbols.cpp
diff --git a/clang/test/Driver/libsycl-print-file-name.c b/clang/test/Driver/sycl-libsycl-print-file-name.cpp
similarity index 100%
rename from clang/test/Driver/libsycl-print-file-name.c
rename to clang/test/Driver/sycl-libsycl-print-file-name.cpp
diff --git a/clang/test/Driver/linker-wrapper-sycl-win.cpp b/clang/test/Driver/sycl-linker-wrapper-win.cpp
similarity index 100%
rename from clang/test/Driver/linker-wrapper-sycl-win.cpp
rename to clang/test/Driver/sycl-linker-wrapper-win.cpp
diff --git a/clang/test/Driver/linker-wrapper-sycl.cpp b/clang/test/Driver/sycl-linker-wrapper.cpp
similarity index 100%
rename from clang/test/Driver/linker-wrapper-sycl.cpp
rename to clang/test/Driver/sycl-linker-wrapper.cpp
diff --git a/clang/test/Driver/offload-fp32-div-sqrt.cpp b/clang/test/Driver/sycl-offload-fp32-div-sqrt.cpp
similarity index 100%
rename from clang/test/Driver/offload-fp32-div-sqrt.cpp
rename to clang/test/Driver/sycl-offload-fp32-div-sqrt.cpp
diff --git a/clang/test/Driver/pch-fsycl-error.cpp b/clang/test/Driver/sycl-pch-error.cpp
similarity index 100%
rename from clang/test/Driver/pch-fsycl-error.cpp
rename to clang/test/Driver/sycl-pch-error.cpp
diff --git a/clang/test/Driver/pch-include-sycl.cpp b/clang/test/Driver/sycl-pch-inlude.cpp
similarity index 100%
rename from clang/test/Driver/pch-include-sycl.cpp
rename to clang/test/Driver/sycl-pch-inlude.cpp
diff --git a/clang/test/Driver/print-internal-defines-for-sycl.c b/clang/test/Driver/sycl-print-internal-defines.cpp
similarity index 97%
rename from clang/test/Driver/print-internal-defines-for-sycl.c
rename to clang/test/Driver/sycl-print-internal-defines.cpp
index f8965b79eb9d6..30e114f00138f 100644
--- a/clang/test/Driver/print-internal-defines-for-sycl.c
+++ b/clang/test/Driver/sycl-print-internal-defines.cpp
@@ -2,7 +2,7 @@
 // Test if clang is able to print internal defines in SYCL mode
 // REQUIRES: x86-registered-target
 //
-// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -dM -E -x c++ %s 2>&1 \
+// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -dM -E %s 2>&1 \
 // RUN: | FileCheck --check-prefix CHECK-PRINT-INTERNAL-DEFINES %s
 // CHECK-PRINT-INTERNAL-DEFINES: #define
 
diff --git a/clang/test/Driver/save-ptx-files.cpp b/clang/test/Driver/sycl-save-ptx-files.cpp
similarity index 100%
rename from clang/test/Driver/save-ptx-files.cpp
rename to clang/test/Driver/sycl-save-ptx-files.cpp
diff --git a/clang/test/Driver/suppress-LNK4078-sycl-link.cpp b/clang/test/Driver/sycl-suppress-LNK4078.cpp
similarity index 100%
rename from clang/test/Driver/suppress-LNK4078-sycl-link.cpp
rename to clang/test/Driver/sycl-suppress-LNK4078.cpp
diff --git a/clang/test/Driver/windows-compat-sycl-args.cpp b/clang/test/Driver/sycl-windows-compat-args.cpp
similarity index 100%
rename from clang/test/Driver/windows-compat-sycl-args.cpp
rename to clang/test/Driver/sycl-windows-compat-args.cpp
diff --git a/clang/test/Driver/cuda-windows-cuda-path.cpp b/clang/test/Driver/sycl-windows-cuda-path.cpp
similarity index 100%
rename from clang/test/Driver/cuda-windows-cuda-path.cpp
rename to clang/test/Driver/sycl-windows-cuda-path.cpp