diff --git a/python/ql/test/2/library-tests/six/options b/python/ql/test/2/library-tests/six/options
index 55e896b67f23..573a285f101e 100644
--- a/python/ql/test/2/library-tests/six/options
+++ b/python/ql/test/2/library-tests/six/options
@@ -1,2 +1 @@
 semmle-extractor-options: --lang=2 --max-import-depth=4
-optimize: true
diff --git a/python/ql/test/3/library-tests/PointsTo/typehints/options b/python/ql/test/3/library-tests/PointsTo/typehints/options
index b3e60ec219e1..666fe9447a1c 100644
--- a/python/ql/test/3/library-tests/PointsTo/typehints/options
+++ b/python/ql/test/3/library-tests/PointsTo/typehints/options
@@ -1,2 +1 @@
 semmle-extractor-options: --lang=3 -p ../../lib/ --max-import-depth=3
-optimize: true
diff --git a/python/ql/test/3/library-tests/six/options b/python/ql/test/3/library-tests/six/options
index 02026a7dcc5f..61838b003766 100644
--- a/python/ql/test/3/library-tests/six/options
+++ b/python/ql/test/3/library-tests/six/options
@@ -1,2 +1 @@
 semmle-extractor-options: --lang=3 --max-import-depth=4
-optimize: true
diff --git a/python/ql/test/library-tests/PointsTo/guarded/options b/python/ql/test/library-tests/PointsTo/guarded/options
index be048160aeb9..e7a518df45b5 100644
--- a/python/ql/test/library-tests/PointsTo/guarded/options
+++ b/python/ql/test/library-tests/PointsTo/guarded/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=3
-optimize: true
diff --git a/python/ql/test/library-tests/PointsTo/new/options b/python/ql/test/library-tests/PointsTo/new/options
index 8e16f310b520..2e240a38e85b 100644
--- a/python/ql/test/library-tests/PointsTo/new/options
+++ b/python/ql/test/library-tests/PointsTo/new/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=4
-optimize: true
diff --git a/python/ql/test/library-tests/PointsTo/returns/options b/python/ql/test/library-tests/PointsTo/returns/options
deleted file mode 100644
index 58ad829f5a88..000000000000
--- a/python/ql/test/library-tests/PointsTo/returns/options
+++ /dev/null
@@ -1 +0,0 @@
-optimize: true
diff --git a/python/ql/test/library-tests/modules/duplicate_name/options b/python/ql/test/library-tests/modules/duplicate_name/options
index ebe93df725a6..3819071b01cc 100644
--- a/python/ql/test/library-tests/modules/duplicate_name/options
+++ b/python/ql/test/library-tests/modules/duplicate_name/options
@@ -1,2 +1 @@
 semmle-extractor-options: -R .
-optimize: true
diff --git a/python/ql/test/library-tests/regex/options b/python/ql/test/library-tests/regex/options
index be048160aeb9..e7a518df45b5 100644
--- a/python/ql/test/library-tests/regex/options
+++ b/python/ql/test/library-tests/regex/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=3
-optimize: true
diff --git a/python/ql/test/library-tests/web/bottle/options b/python/ql/test/library-tests/web/bottle/options
index e6bd3a732dcb..7fb713d59242 100644
--- a/python/ql/test/library-tests/web/bottle/options
+++ b/python/ql/test/library-tests/web/bottle/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=3 -p ../../../query-tests/Security/lib/
-optimize: true
diff --git a/python/ql/test/library-tests/web/cherrypy/options b/python/ql/test/library-tests/web/cherrypy/options
index e6bd3a732dcb..7fb713d59242 100644
--- a/python/ql/test/library-tests/web/cherrypy/options
+++ b/python/ql/test/library-tests/web/cherrypy/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=3 -p ../../../query-tests/Security/lib/
-optimize: true
diff --git a/python/ql/test/library-tests/web/django/options b/python/ql/test/library-tests/web/django/options
index d7a40c71d464..a87f995c3969 100644
--- a/python/ql/test/library-tests/web/django/options
+++ b/python/ql/test/library-tests/web/django/options
@@ -1,2 +1 @@
 semmle-extractor-options: --lang=3 --max-import-depth=3 -p ../../../query-tests/Security/lib/
-optimize: true
diff --git a/python/ql/test/library-tests/web/falcon/options b/python/ql/test/library-tests/web/falcon/options
index e6bd3a732dcb..7fb713d59242 100644
--- a/python/ql/test/library-tests/web/falcon/options
+++ b/python/ql/test/library-tests/web/falcon/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=3 -p ../../../query-tests/Security/lib/
-optimize: true
diff --git a/python/ql/test/library-tests/web/flask/options b/python/ql/test/library-tests/web/flask/options
index e6bd3a732dcb..7fb713d59242 100644
--- a/python/ql/test/library-tests/web/flask/options
+++ b/python/ql/test/library-tests/web/flask/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=3 -p ../../../query-tests/Security/lib/
-optimize: true
diff --git a/python/ql/test/library-tests/web/pyramid/options b/python/ql/test/library-tests/web/pyramid/options
index 0267f80a6d65..1d132442a3bb 100644
--- a/python/ql/test/library-tests/web/pyramid/options
+++ b/python/ql/test/library-tests/web/pyramid/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=2 -p ../../../query-tests/Security/lib/
-optimize: true
diff --git a/python/ql/test/library-tests/web/tornado/options b/python/ql/test/library-tests/web/tornado/options
index 0267f80a6d65..1d132442a3bb 100644
--- a/python/ql/test/library-tests/web/tornado/options
+++ b/python/ql/test/library-tests/web/tornado/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=2 -p ../../../query-tests/Security/lib/
-optimize: true
diff --git a/python/ql/test/library-tests/web/turbogears/options b/python/ql/test/library-tests/web/turbogears/options
index e6bd3a732dcb..7fb713d59242 100644
--- a/python/ql/test/library-tests/web/turbogears/options
+++ b/python/ql/test/library-tests/web/turbogears/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=3 -p ../../../query-tests/Security/lib/
-optimize: true
diff --git a/python/ql/test/library-tests/web/twisted/options b/python/ql/test/library-tests/web/twisted/options
index 6979a743e58e..4084b102b552 100644
--- a/python/ql/test/library-tests/web/twisted/options
+++ b/python/ql/test/library-tests/web/twisted/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=1 -p ../../../query-tests/Security/lib/
-optimize: true
diff --git a/python/ql/test/query-tests/Security/CWE-022/options b/python/ql/test/query-tests/Security/CWE-022/options
index dce78f52325e..492768b3481f 100644
--- a/python/ql/test/query-tests/Security/CWE-022/options
+++ b/python/ql/test/query-tests/Security/CWE-022/options
@@ -1,2 +1 @@
 semmle-extractor-options: -p ../lib/ --max-import-depth=3
-optimize: true
diff --git a/python/ql/test/query-tests/Security/CWE-078/options b/python/ql/test/query-tests/Security/CWE-078/options
index dce78f52325e..492768b3481f 100644
--- a/python/ql/test/query-tests/Security/CWE-078/options
+++ b/python/ql/test/query-tests/Security/CWE-078/options
@@ -1,2 +1 @@
 semmle-extractor-options: -p ../lib/ --max-import-depth=3
-optimize: true
diff --git a/python/ql/test/query-tests/Security/CWE-094/options b/python/ql/test/query-tests/Security/CWE-094/options
index dce78f52325e..492768b3481f 100644
--- a/python/ql/test/query-tests/Security/CWE-094/options
+++ b/python/ql/test/query-tests/Security/CWE-094/options
@@ -1,2 +1 @@
 semmle-extractor-options: -p ../lib/ --max-import-depth=3
-optimize: true
diff --git a/python/ql/test/query-tests/Security/CWE-326/options b/python/ql/test/query-tests/Security/CWE-326/options
index dce78f52325e..492768b3481f 100644
--- a/python/ql/test/query-tests/Security/CWE-326/options
+++ b/python/ql/test/query-tests/Security/CWE-326/options
@@ -1,2 +1 @@
 semmle-extractor-options: -p ../lib/ --max-import-depth=3
-optimize: true
diff --git a/python/ql/test/query-tests/Security/CWE-327/options b/python/ql/test/query-tests/Security/CWE-327/options
index dce78f52325e..492768b3481f 100644
--- a/python/ql/test/query-tests/Security/CWE-327/options
+++ b/python/ql/test/query-tests/Security/CWE-327/options
@@ -1,2 +1 @@
 semmle-extractor-options: -p ../lib/ --max-import-depth=3
-optimize: true
diff --git a/python/ql/test/query-tests/Security/CWE-377/options b/python/ql/test/query-tests/Security/CWE-377/options
index dce78f52325e..492768b3481f 100644
--- a/python/ql/test/query-tests/Security/CWE-377/options
+++ b/python/ql/test/query-tests/Security/CWE-377/options
@@ -1,2 +1 @@
 semmle-extractor-options: -p ../lib/ --max-import-depth=3
-optimize: true
diff --git a/python/ql/test/query-tests/Security/CWE-502/options b/python/ql/test/query-tests/Security/CWE-502/options
index b63c517ee296..84717fe64cff 100644
--- a/python/ql/test/query-tests/Security/CWE-502/options
+++ b/python/ql/test/query-tests/Security/CWE-502/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=2 -p ../lib
-optimize: true
diff --git a/python/ql/test/query-tests/Security/CWE-732/options b/python/ql/test/query-tests/Security/CWE-732/options
index b63c517ee296..84717fe64cff 100644
--- a/python/ql/test/query-tests/Security/CWE-732/options
+++ b/python/ql/test/query-tests/Security/CWE-732/options
@@ -1,2 +1 @@
 semmle-extractor-options: --max-import-depth=2 -p ../lib
-optimize: true
diff --git a/python/ql/test/query-tests/Security/options b/python/ql/test/query-tests/Security/options
deleted file mode 100644
index 58ad829f5a88..000000000000
--- a/python/ql/test/query-tests/Security/options
+++ /dev/null
@@ -1 +0,0 @@
-optimize: true