diff --git a/python/ql/src/experimental/Security/CWE-091/Xslt.qhelp b/python/ql/src/experimental/Security/CWE-091/XsltInjection.qhelp
similarity index 100%
rename from python/ql/src/experimental/Security/CWE-091/Xslt.qhelp
rename to python/ql/src/experimental/Security/CWE-091/XsltInjection.qhelp
diff --git a/python/ql/src/experimental/Security/CWE-091/Xslt.ql b/python/ql/src/experimental/Security/CWE-091/XsltInjection.ql
similarity index 100%
rename from python/ql/src/experimental/Security/CWE-091/Xslt.ql
rename to python/ql/src/experimental/Security/CWE-091/XsltInjection.ql
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091/Xslt.expected b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.expected
similarity index 100%
rename from python/ql/test/experimental/query-tests/Security/CWE-091/Xslt.expected
rename to python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.expected
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.qlref b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.qlref
new file mode 100644
index 00000000000..4d432d461ca
--- /dev/null
+++ b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltInjection.qlref
@@ -0,0 +1 @@
+experimental/Security/CWE-091/XsltInjection.ql
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091/XsltSinks.expected b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltSinks.expected
similarity index 100%
rename from python/ql/test/experimental/query-tests/Security/CWE-091/XsltSinks.expected
rename to python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltSinks.expected
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091/XsltSinks.ql b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltSinks.ql
similarity index 100%
rename from python/ql/test/experimental/query-tests/Security/CWE-091/XsltSinks.ql
rename to python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/XsltSinks.ql
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091/options b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/options
similarity index 100%
rename from python/ql/test/experimental/query-tests/Security/CWE-091/options
rename to python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/options
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091/xslt.py b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/xslt.py
similarity index 100%
rename from python/ql/test/experimental/query-tests/Security/CWE-091/xslt.py
rename to python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/xslt.py
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091/xsltInjection.py b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/xsltInjection.py
similarity index 100%
rename from python/ql/test/experimental/query-tests/Security/CWE-091/xsltInjection.py
rename to python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/xsltInjection.py
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091/xsltSinks.py b/python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/xsltSinks.py
similarity index 100%
rename from python/ql/test/experimental/query-tests/Security/CWE-091/xsltSinks.py
rename to python/ql/test/experimental/query-tests/Security/CWE-091-XsltInjection/xsltSinks.py
diff --git a/python/ql/test/experimental/query-tests/Security/CWE-091/Xslt.qlref b/python/ql/test/experimental/query-tests/Security/CWE-091/Xslt.qlref
deleted file mode 100644
index 988d13e98a6..00000000000
--- a/python/ql/test/experimental/query-tests/Security/CWE-091/Xslt.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security/CWE-091/Xslt.ql