diff --git a/CODEOWNERS b/CODEOWNERS
index 612a5e8a22a..7233623d452 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -18,7 +18,6 @@
 # Experimental CodeQL cryptography
 **/experimental/**/quantum/ @github/ps-codeql
 /shared/quantum/ @github/ps-codeql
-**/test/stubs/crypto/ @github/ps-codeql
 
 # CodeQL tools and associated docs
 /docs/codeql/codeql-cli/ @github/codeql-cli-reviewers
diff --git a/cpp/ql/test/experimental/library-tests/quantum/openssl/options b/cpp/ql/test/experimental/library-tests/quantum/openssl/options
index 7ea00eb0bfb..eb3abc42d12 100644
--- a/cpp/ql/test/experimental/library-tests/quantum/openssl/options
+++ b/cpp/ql/test/experimental/library-tests/quantum/openssl/options
@@ -1 +1 @@
-semmle-extractor-options: -I ../../../../stubs/crypto
\ No newline at end of file
+semmle-extractor-options: -I ../../../stubs
\ No newline at end of file
diff --git a/cpp/ql/test/stubs/README.md b/cpp/ql/test/experimental/stubs/README.md
similarity index 100%
rename from cpp/ql/test/stubs/README.md
rename to cpp/ql/test/experimental/stubs/README.md
diff --git a/cpp/ql/test/stubs/crypto/openssl/alg_macro_stubs.h b/cpp/ql/test/experimental/stubs/openssl/alg_macro_stubs.h
similarity index 100%
rename from cpp/ql/test/stubs/crypto/openssl/alg_macro_stubs.h
rename to cpp/ql/test/experimental/stubs/openssl/alg_macro_stubs.h
diff --git a/cpp/ql/test/stubs/crypto/openssl/evp_stubs.h b/cpp/ql/test/experimental/stubs/openssl/evp_stubs.h
similarity index 100%
rename from cpp/ql/test/stubs/crypto/openssl/evp_stubs.h
rename to cpp/ql/test/experimental/stubs/openssl/evp_stubs.h
diff --git a/cpp/ql/test/stubs/crypto/openssl/license.txt b/cpp/ql/test/experimental/stubs/openssl/license.txt
similarity index 100%
rename from cpp/ql/test/stubs/crypto/openssl/license.txt
rename to cpp/ql/test/experimental/stubs/openssl/license.txt
diff --git a/cpp/ql/test/stubs/crypto/openssl/rand_stubs.h b/cpp/ql/test/experimental/stubs/openssl/rand_stubs.h
similarity index 100%
rename from cpp/ql/test/stubs/crypto/openssl/rand_stubs.h
rename to cpp/ql/test/experimental/stubs/openssl/rand_stubs.h