diff --git a/cpp/ql/test/header-variant-tests/iquote/iquote.c b/cpp/ql/test/header-variant-tests/iquote/iquote.c
index a2b6e279a54..448a4821621 100644
--- a/cpp/ql/test/header-variant-tests/iquote/iquote.c
+++ b/cpp/ql/test/header-variant-tests/iquote/iquote.c
@@ -3,4 +3,4 @@
 #include "b.h"
 static int has_angle_b = __has_include(<b.h>);
 
-// semmle-extractor-options: -I${testdir}/dir2 -iquote ${testdir}/dir1 --edg --clang
+// semmle-extractor-options: -I${testdir}/dir2 -iquote ${testdir}/dir1 --clang
diff --git a/cpp/ql/test/library-tests/CPP-207/options b/cpp/ql/test/library-tests/CPP-207/options
index 33fc0002eca..c3fc566fda2 100644
--- a/cpp/ql/test/library-tests/CPP-207/options
+++ b/cpp/ql/test/library-tests/CPP-207/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --microsoft
+semmle-extractor-options: --microsoft
diff --git a/cpp/ql/test/library-tests/attributes/availability/options b/cpp/ql/test/library-tests/attributes/availability/options
index 5c627fb50d0..69b65afcd43 100644
--- a/cpp/ql/test/library-tests/attributes/availability/options
+++ b/cpp/ql/test/library-tests/attributes/availability/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --clang
+semmle-extractor-options: --clang
diff --git a/cpp/ql/test/library-tests/clang_builtin_macros/addressof.c b/cpp/ql/test/library-tests/clang_builtin_macros/addressof.c
index becaef159cc..b06be91d94b 100644
--- a/cpp/ql/test/library-tests/clang_builtin_macros/addressof.c
+++ b/cpp/ql/test/library-tests/clang_builtin_macros/addressof.c
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang
+// semmle-extractor-options: --clang
 
 int x = 0;
 
diff --git a/cpp/ql/test/library-tests/clang_builtin_macros/extended.cpp b/cpp/ql/test/library-tests/clang_builtin_macros/extended.cpp
index 8b3ab9d48c5..0cb48fcd4d1 100644
--- a/cpp/ql/test/library-tests/clang_builtin_macros/extended.cpp
+++ b/cpp/ql/test/library-tests/clang_builtin_macros/extended.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang --edg --c++11 --edg --nullptr
+// semmle-extractor-options: --clang --edg --c++11 --edg --nullptr
 
 static int has_nullptr_f = __has_feature(cxx_nullptr);
 static int has_nullptr_e = __has_extension(cxx_nullptr);
diff --git a/cpp/ql/test/library-tests/clang_builtin_macros/options b/cpp/ql/test/library-tests/clang_builtin_macros/options
index 5c627fb50d0..69b65afcd43 100644
--- a/cpp/ql/test/library-tests/clang_builtin_macros/options
+++ b/cpp/ql/test/library-tests/clang_builtin_macros/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --clang
+semmle-extractor-options: --clang
diff --git a/cpp/ql/test/library-tests/clang_builtin_macros/test.cpp b/cpp/ql/test/library-tests/clang_builtin_macros/test.cpp
index 14023a67063..e3807dcf91b 100644
--- a/cpp/ql/test/library-tests/clang_builtin_macros/test.cpp
+++ b/cpp/ql/test/library-tests/clang_builtin_macros/test.cpp
@@ -1,7 +1,7 @@
 // For the canonical behaviour, run: clang -E -w test.cpp
 #define __builtin_TRAP __builtin_trap
 #define BAR "bar.h"
-// semmle-extractor-options: --edg --clang --expect_errors
+// semmle-extractor-options: --clang --expect_errors
 #if defined(__has_include)
 static int has_include = 1;
 #else
diff --git a/cpp/ql/test/library-tests/clang_ms/options b/cpp/ql/test/library-tests/clang_ms/options
index 4e921d3d094..70174c48e63 100644
--- a/cpp/ql/test/library-tests/clang_ms/options
+++ b/cpp/ql/test/library-tests/clang_ms/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --clang --edg --ms_extensions
+semmle-extractor-options: --clang --edg --ms_extensions
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/clang.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/clang.cpp
index f157f75adcd..e0ad64674bc 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/clang.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/clang.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang
+// semmle-extractor-options: --clang
 
 int source();
 void sink(int); void sink(const int *); void sink(int **); void indirect_sink(...);
diff --git a/cpp/ql/test/library-tests/declspec/guard/test.cpp b/cpp/ql/test/library-tests/declspec/guard/test.cpp
index 0055ba6b0c0..f59f9953507 100644
--- a/cpp/ql/test/library-tests/declspec/guard/test.cpp
+++ b/cpp/ql/test/library-tests/declspec/guard/test.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --microsoft
+// semmle-extractor-options: --microsoft
 
 void f(__declspec(guard(overflow)) size_t length) {
 }
diff --git a/cpp/ql/test/library-tests/specifiers2/cpp20.cpp b/cpp/ql/test/library-tests/specifiers2/cpp20.cpp
index d260eaecf81..484c32a2358 100644
--- a/cpp/ql/test/library-tests/specifiers2/cpp20.cpp
+++ b/cpp/ql/test/library-tests/specifiers2/cpp20.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang --edg --c++20
+// semmle-extractor-options: --clang --edg --c++20
 
 namespace cpp20 {
 
diff --git a/cpp/ql/test/library-tests/structs/compatible_c/c1_gnu.c b/cpp/ql/test/library-tests/structs/compatible_c/c1_gnu.c
index cc00bc3561b..97e4d2519bb 100644
--- a/cpp/ql/test/library-tests/structs/compatible_c/c1_gnu.c
+++ b/cpp/ql/test/library-tests/structs/compatible_c/c1_gnu.c
@@ -7,4 +7,4 @@ struct Kiwi {
 struct Lemon {
   unsigned int __attribute__ ((vector_size (16))) lemon_x;
 };
-// semmle-extractor-options: --edg --c99 --edg --clang --edg --clang_vector_types --gnu_version 40700
+// semmle-extractor-options: --edg --c99 --clang --edg --clang_vector_types --gnu_version 40700
diff --git a/cpp/ql/test/library-tests/structs/compatible_c/c2_gnu.c b/cpp/ql/test/library-tests/structs/compatible_c/c2_gnu.c
index c1e8edafcc9..0dba41d1660 100644
--- a/cpp/ql/test/library-tests/structs/compatible_c/c2_gnu.c
+++ b/cpp/ql/test/library-tests/structs/compatible_c/c2_gnu.c
@@ -7,4 +7,4 @@ struct Kiwi {
 struct Lemon {
   signed int __attribute__ ((vector_size (16))) lemon_x;
 };
-// semmle-extractor-options: --edg --c99 --edg --clang --edg --clang_vector_types --gnu_version 40700
+// semmle-extractor-options: --edg --c99 --clang --edg --clang_vector_types --gnu_version 40700
diff --git a/cpp/ql/test/library-tests/templates/CPP-223/test.cpp b/cpp/ql/test/library-tests/templates/CPP-223/test.cpp
index 620571d2f11..80298f6132f 100644
--- a/cpp/ql/test/library-tests/templates/CPP-223/test.cpp
+++ b/cpp/ql/test/library-tests/templates/CPP-223/test.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang --edg --ms_extensions
+// semmle-extractor-options: --clang --edg --ms_extensions
 
 template <int a> class b {
   template <bool> struct c;
diff --git a/cpp/ql/test/library-tests/vector_types/options b/cpp/ql/test/library-tests/vector_types/options
index fbf44adcdd9..5d8122c6f2f 100644
--- a/cpp/ql/test/library-tests/vector_types/options
+++ b/cpp/ql/test/library-tests/vector_types/options
@@ -1 +1 @@
-semmle-extractor-options: --edg --clang --edg --clang_builtin_functions --edg --clang_vector_types --gnu_version 40600
+semmle-extractor-options: --clang --edg --clang_builtin_functions --edg --clang_vector_types --gnu_version 40600
diff --git a/cpp/ql/test/library-tests/vector_types/vector_types.cpp b/cpp/ql/test/library-tests/vector_types/vector_types.cpp
index 8f928386af4..dd35743cb3c 100644
--- a/cpp/ql/test/library-tests/vector_types/vector_types.cpp
+++ b/cpp/ql/test/library-tests/vector_types/vector_types.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --edg --clang --edg --clang_version --edg 30801
+// semmle-extractor-options: --clang --edg --clang_version --edg 30801
 // Compilable with: clang --std=c++0x -msse4.1 vector_types.cpp
 // (some bits also compilable with gcc)
 int printf(...);