diff --git a/Tests/ClangPlugins/CMakeLists.txt b/Tests/ClangPlugins/CMakeLists.txt
index 45f0ea40a2d..fc305de7a50 100644
--- a/Tests/ClangPlugins/CMakeLists.txt
+++ b/Tests/ClangPlugins/CMakeLists.txt
@@ -11,7 +11,6 @@ list(APPEND CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS
     -Wno-literal-range
     -Wno-unknown-warning-option
     -Wno-unqualified-std-cast-call
-    -fgnuc-version=4.2.1 # NOTE: Clang default as of 10.0.0
 )
 
 # Ensure we always check for invalid function field types regardless of the value of ENABLE_CLANG_PLUGINS_INVALID_FUNCTION_MEMBERS
@@ -19,7 +18,6 @@ list(APPEND CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS
 # list(APPEND CLANG_PLUGINS_COMPILE_OPTIONS_FOR_TESTS -fplugin-arg-libjs_gc_scanner-detect-invalid-function-members)
 
 get_property(CLANG_PLUGINS_INCLUDE_DIRECTORIES TARGET AK PROPERTY INCLUDE_DIRECTORIES)
-list(APPEND CLANG_PLUGINS_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES})
 
 configure_lit_site_cfg(
     ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
diff --git a/Tests/ClangPlugins/LambdaTests/lambda_capture_local_by_ref.cpp b/Tests/ClangPlugins/LambdaTests/lambda_capture_local_by_ref.cpp
index 7861ed54b28..a17416141d9 100644
--- a/Tests/ClangPlugins/LambdaTests/lambda_capture_local_by_ref.cpp
+++ b/Tests/ClangPlugins/LambdaTests/lambda_capture_local_by_ref.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <AK/Function.h>
 
diff --git a/Tests/ClangPlugins/LambdaTests/lambda_capture_local_marked_ignore_by_ref.cpp b/Tests/ClangPlugins/LambdaTests/lambda_capture_local_marked_ignore_by_ref.cpp
index c6c74674902..b120fee19e5 100644
--- a/Tests/ClangPlugins/LambdaTests/lambda_capture_local_marked_ignore_by_ref.cpp
+++ b/Tests/ClangPlugins/LambdaTests/lambda_capture_local_marked_ignore_by_ref.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics
 
 #include <AK/Function.h>
diff --git a/Tests/ClangPlugins/LibJSGCTests/Macros/classes_are_missing_expected_macros.cpp b/Tests/ClangPlugins/LibJSGCTests/Macros/classes_are_missing_expected_macros.cpp
index 59a3159d2c3..77e455b4656 100644
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/classes_are_missing_expected_macros.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/classes_are_missing_expected_macros.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibGC/ForeignCell.h>
 #include <LibJS/Runtime/PrototypeObject.h>
diff --git a/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_expected_macros.cpp b/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_expected_macros.cpp
index 20c5484f61d..9682810fa4b 100644
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_expected_macros.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_expected_macros.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics
 
 #include <LibGC/ForeignCell.h>
diff --git a/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_incorrect_macro_types.cpp b/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_incorrect_macro_types.cpp
index 7cf8d1337c8..364ca34c49f 100644
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_incorrect_macro_types.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/classes_have_incorrect_macro_types.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibGC/ForeignCell.h>
 #include <LibJS/Runtime/Object.h>
diff --git a/Tests/ClangPlugins/LibJSGCTests/Macros/nested_macros.cpp b/Tests/ClangPlugins/LibJSGCTests/Macros/nested_macros.cpp
index 85247d3a54c..d2e561af64d 100644
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/nested_macros.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/nested_macros.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibJS/Runtime/Object.h>
 
diff --git a/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_basename_arg.cpp b/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_basename_arg.cpp
index f398ece5b38..37d33e873ef 100644
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_basename_arg.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_basename_arg.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibJS/Runtime/Object.h>
 
diff --git a/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_classname_arg.cpp b/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_classname_arg.cpp
index c5ab6501a7a..69b94b5b08f 100644
--- a/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_classname_arg.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/Macros/wrong_classname_arg.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibGC/ForeignCell.h>
 #include <LibJS/Runtime/PrototypeObject.h>
diff --git a/Tests/ClangPlugins/LibJSGCTests/calling_base_visit_edges_not_through_using_decl.cpp b/Tests/ClangPlugins/LibJSGCTests/calling_base_visit_edges_not_through_using_decl.cpp
index 22f92c5218c..9c165f24eda 100644
--- a/Tests/ClangPlugins/LibJSGCTests/calling_base_visit_edges_not_through_using_decl.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/calling_base_visit_edges_not_through_using_decl.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibJS/Runtime/Object.h>
 
diff --git a/Tests/ClangPlugins/LibJSGCTests/cell_member_not_wrapped.cpp b/Tests/ClangPlugins/LibJSGCTests/cell_member_not_wrapped.cpp
index f9c718cf69e..0764f6dbe9d 100644
--- a/Tests/ClangPlugins/LibJSGCTests/cell_member_not_wrapped.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/cell_member_not_wrapped.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibJS/Runtime/Object.h>
 
diff --git a/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_accessed.cpp b/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_accessed.cpp
index 7541fac0fbd..67ee93813b4 100644
--- a/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_accessed.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_accessed.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics
 
 #include <LibJS/Runtime/Object.h>
diff --git a/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_visited.cpp b/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_visited.cpp
index 1dfe5e16e7d..662f085c987 100644
--- a/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_visited.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/gc_allocated_member_is_visited.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics
 
 #include <LibJS/Runtime/Object.h>
diff --git a/Tests/ClangPlugins/LibJSGCTests/missing_call_to_base_visit_edges.cpp b/Tests/ClangPlugins/LibJSGCTests/missing_call_to_base_visit_edges.cpp
index 67143f7914e..c7bc5ba49cf 100644
--- a/Tests/ClangPlugins/LibJSGCTests/missing_call_to_base_visit_edges.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/missing_call_to_base_visit_edges.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibJS/Runtime/Object.h>
 
diff --git a/Tests/ClangPlugins/LibJSGCTests/missing_member_in_visit_edges.cpp b/Tests/ClangPlugins/LibJSGCTests/missing_member_in_visit_edges.cpp
index fc3e580593b..9d32737b1fd 100644
--- a/Tests/ClangPlugins/LibJSGCTests/missing_member_in_visit_edges.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/missing_member_in_visit_edges.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibJS/Runtime/Object.h>
 
diff --git a/Tests/ClangPlugins/LibJSGCTests/missing_visit_edges_method.cpp b/Tests/ClangPlugins/LibJSGCTests/missing_visit_edges_method.cpp
index 836fbaff15a..6cda254677c 100644
--- a/Tests/ClangPlugins/LibJSGCTests/missing_visit_edges_method.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/missing_visit_edges_method.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 
 #include <LibJS/Runtime/Object.h>
 
diff --git a/Tests/ClangPlugins/LibJSGCTests/non_cell_class.cpp b/Tests/ClangPlugins/LibJSGCTests/non_cell_class.cpp
index b5a4e2a3933..0520ab07255 100644
--- a/Tests/ClangPlugins/LibJSGCTests/non_cell_class.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/non_cell_class.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics
 
 #include <LibJS/Runtime/Object.h>
diff --git a/Tests/ClangPlugins/LibJSGCTests/not_visiting_rawgcptr.cpp b/Tests/ClangPlugins/LibJSGCTests/not_visiting_rawgcptr.cpp
index 381f2ef5493..57363fb52fc 100644
--- a/Tests/ClangPlugins/LibJSGCTests/not_visiting_rawgcptr.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/not_visiting_rawgcptr.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // expected-no-diagnostics
 
 #include <LibGC/Cell.h>
diff --git a/Tests/ClangPlugins/LibJSGCTests/strong_root_fields_in_gc_allocated_types.cpp b/Tests/ClangPlugins/LibJSGCTests/strong_root_fields_in_gc_allocated_types.cpp
index 8acc71d3334..74497cf776e 100644
--- a/Tests/ClangPlugins/LibJSGCTests/strong_root_fields_in_gc_allocated_types.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/strong_root_fields_in_gc_allocated_types.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t 2>&1
 // FIXME: Un-XFAIL this when re-enabling the plugin option in the Tests CMakeLists.txt
 // XFAIL: true
 
diff --git a/Tests/ClangPlugins/LibJSGCTests/wrapping_non_cell_member.cpp b/Tests/ClangPlugins/LibJSGCTests/wrapping_non_cell_member.cpp
index 6ac1dcb07de..dc81c7fad32 100644
--- a/Tests/ClangPlugins/LibJSGCTests/wrapping_non_cell_member.cpp
+++ b/Tests/ClangPlugins/LibJSGCTests/wrapping_non_cell_member.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-2-Clause
  */
 
-// RUN: %clang++ -cc1 -verify %plugin_opts% %s 2>&1
+// RUN: %clang++ -Xclang -verify %plugin_opts% -c %s -o %t  2>&1
 
 #include <LibGC/Ptr.h>
 #include <LibGC/RootVector.h>
diff --git a/Tests/ClangPlugins/lit.cfg.py b/Tests/ClangPlugins/lit.cfg.py
index ecc568457a0..d2db6154328 100644
--- a/Tests/ClangPlugins/lit.cfg.py
+++ b/Tests/ClangPlugins/lit.cfg.py
@@ -18,7 +18,7 @@ config.substitutions.append(("%target_triple", config.target_triple))
 config.substitutions.append(("%PATH%", config.environment["PATH"]))
 
 plugin_includes = " ".join(f"-I{s}" for s in config.plugin_includes.split(";"))
-plugin_opts = " ".join(s.replace("-fplugin=", "-load ") for s in config.plugin_opts.split(";"))
+plugin_opts = " ".join(s for s in config.plugin_opts.split(";"))
 config.substitutions.append(("%plugin_opts%", f"{plugin_opts} {plugin_includes}"))
 
 tools = ["clang", "clang++"]