diff --git a/python/ql/src/experimental/Security/CWE-611/unit_tests/XXE.qlref b/python/ql/test/experimental/query-tests/Security/CWE-611/XXE.qlref
similarity index 100%
rename from python/ql/src/experimental/Security/CWE-611/unit_tests/XXE.qlref
rename to python/ql/test/experimental/query-tests/Security/CWE-611/XXE.qlref
diff --git a/python/ql/src/experimental/Security/CWE-611/unit_tests/general.py b/python/ql/test/experimental/query-tests/Security/CWE-611/general.py
similarity index 96%
rename from python/ql/src/experimental/Security/CWE-611/unit_tests/general.py
rename to python/ql/test/experimental/query-tests/Security/CWE-611/general.py
index 96c3d46f743..f548f950fba 100644
--- a/python/ql/src/experimental/Security/CWE-611/unit_tests/general.py
+++ b/python/ql/test/experimental/query-tests/Security/CWE-611/general.py
@@ -6,6 +6,13 @@ import xml.dom.minidom, xml.dom.pulldom
 import xmltodict
 
 '''
+TO-DO
+
+Extend tests
+Model xmltodict and xml.dom
+Write StringIO/BytesIO additional tain steps
+
+
 XML Parsers:
   xml.etree.ElementTree.XMLParser() - no options, vuln by default
   lxml.etree.XMLParser() - no_network=True huge_tree=False resolve_entities=True
diff --git a/python/ql/src/experimental/Security/CWE-611/unit_tests/xml_sax_make_parser.py b/python/ql/test/experimental/query-tests/Security/CWE-611/xml_sax_make_parser.py
similarity index 100%
rename from python/ql/src/experimental/Security/CWE-611/unit_tests/xml_sax_make_parser.py
rename to python/ql/test/experimental/query-tests/Security/CWE-611/xml_sax_make_parser.py