diff --git a/python/ql/test/experimental/query-tests/Security/CWE-079/.gitkeep b/python/ql/test/experimental/query-tests/Security/CWE-079/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/python/ql/src/experimental/Security/CWE-079/unit_tests/ReflectedXSS.qlref b/python/ql/test/experimental/query-tests/Security/CWE-079/ReflectedXSS.qlref
similarity index 100%
rename from python/ql/src/experimental/Security/CWE-079/unit_tests/ReflectedXSS.qlref
rename to python/ql/test/experimental/query-tests/Security/CWE-079/ReflectedXSS.qlref
diff --git a/python/ql/src/experimental/Security/CWE-079/unit_tests/flask_mail.py b/python/ql/test/experimental/query-tests/Security/CWE-079/flask_mail.py
similarity index 96%
rename from python/ql/src/experimental/Security/CWE-079/unit_tests/flask_mail.py
rename to python/ql/test/experimental/query-tests/Security/CWE-079/flask_mail.py
index 8b1494b539f..a2b19786057 100644
--- a/python/ql/src/experimental/Security/CWE-079/unit_tests/flask_mail.py
+++ b/python/ql/test/experimental/query-tests/Security/CWE-079/flask_mail.py
@@ -1,6 +1,7 @@
 # https://pythonhosted.org/Flask-Mail/
 # https://github.com/mattupstate/flask-mail/blob/1709c70d839a7cc7b1f7eeb97333b71cd420fe32/flask_mail.py#L239
 
+from flask import request, Flask
 from flask_mail import Mail, Message
 
 app = Flask(__name__)
diff --git a/python/ql/src/experimental/Security/CWE-079/unit_tests/sendgrid_mail_helper_content_bad.py b/python/ql/test/experimental/query-tests/Security/CWE-079/sendgrid_mail_helper_content_bad.py
similarity index 100%
rename from python/ql/src/experimental/Security/CWE-079/unit_tests/sendgrid_mail_helper_content_bad.py
rename to python/ql/test/experimental/query-tests/Security/CWE-079/sendgrid_mail_helper_content_bad.py
diff --git a/python/ql/src/experimental/Security/CWE-079/unit_tests/sendgrid_via_mail_send_post_request_body_bad.py b/python/ql/test/experimental/query-tests/Security/CWE-079/sendgrid_via_mail_send_post_request_body_bad.py
similarity index 100%
rename from python/ql/src/experimental/Security/CWE-079/unit_tests/sendgrid_via_mail_send_post_request_body_bad.py
rename to python/ql/test/experimental/query-tests/Security/CWE-079/sendgrid_via_mail_send_post_request_body_bad.py
diff --git a/python/ql/src/experimental/Security/CWE-079/unit_tests/smtplib_bad_subparts.py b/python/ql/test/experimental/query-tests/Security/CWE-079/smtplib_bad_subparts.py
similarity index 100%
rename from python/ql/src/experimental/Security/CWE-079/unit_tests/smtplib_bad_subparts.py
rename to python/ql/test/experimental/query-tests/Security/CWE-079/smtplib_bad_subparts.py
diff --git a/python/ql/src/experimental/Security/CWE-079/unit_tests/smtplib_bad_via_attach.py b/python/ql/test/experimental/query-tests/Security/CWE-079/smtplib_bad_via_attach.py
similarity index 100%
rename from python/ql/src/experimental/Security/CWE-079/unit_tests/smtplib_bad_via_attach.py
rename to python/ql/test/experimental/query-tests/Security/CWE-079/smtplib_bad_via_attach.py