diff --git a/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/HeaderInjection.expected b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/HeaderInjection.expected
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/HeaderInjection.expected
rename to python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/HeaderInjection.expected
diff --git a/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/HeaderInjection.qlref b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/HeaderInjection.qlref
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/HeaderInjection.qlref
rename to python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/HeaderInjection.qlref
diff --git a/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/HeaderWriteTest.expected b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/HeaderWriteTest.expected
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/HeaderWriteTest.expected
rename to python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/HeaderWriteTest.expected
diff --git a/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/HeaderWriteTest.ql b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/HeaderWriteTest.ql
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/HeaderWriteTest.ql
rename to python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/HeaderWriteTest.ql
diff --git a/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/wsgiref_tests.py b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/wsgiref_tests.py
similarity index 73%
rename from python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/wsgiref_tests.py
rename to python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/wsgiref_tests.py
index 9eb2371974a..834435f338c 100644
--- a/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2/wsgiref_tests.py
+++ b/python/ql/test/query-tests/Security/CWE-113-HeaderInjection/Tests2-with-wsgi-validator/wsgiref_tests.py
@@ -1,3 +1,5 @@
+# These tests use a wsgi validator; so are split into a separate directory from the other tests since the models only check for the presence of a validator in the database. 
+
 from wsgiref.simple_server import make_server 
 from wsgiref.headers import Headers
 from wsgiref.validate import validator