diff --git a/python/ql/test/query-tests/Security/CWE-943/NoSQLInjection.expected b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/NoSqlInjection.expected
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-943/NoSQLInjection.expected
rename to python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/NoSqlInjection.expected
diff --git a/python/ql/test/query-tests/Security/CWE-943/NoSQLInjection.qlref b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/NoSqlInjection.qlref
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-943/NoSQLInjection.qlref
rename to python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/NoSqlInjection.qlref
diff --git a/python/ql/test/query-tests/Security/CWE-943/flask_mongoengine_bad.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_bad.py
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-943/flask_mongoengine_bad.py
rename to python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_bad.py
diff --git a/python/ql/test/query-tests/Security/CWE-943/flask_mongoengine_good.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_good.py
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-943/flask_mongoengine_good.py
rename to python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_mongoengine_good.py
diff --git a/python/ql/test/query-tests/Security/CWE-943/flask_pymongo_bad.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_bad.py
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-943/flask_pymongo_bad.py
rename to python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_bad.py
diff --git a/python/ql/test/query-tests/Security/CWE-943/flask_pymongo_good.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_good.py
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-943/flask_pymongo_good.py
rename to python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/flask_pymongo_good.py
diff --git a/python/ql/test/query-tests/Security/CWE-943/mongoengine_bad.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_bad.py
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-943/mongoengine_bad.py
rename to python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_bad.py
diff --git a/python/ql/test/query-tests/Security/CWE-943/mongoengine_good.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_good.py
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-943/mongoengine_good.py
rename to python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/mongoengine_good.py
diff --git a/python/ql/test/query-tests/Security/CWE-943/pymongo_test.py b/python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/pymongo_test.py
similarity index 100%
rename from python/ql/test/query-tests/Security/CWE-943/pymongo_test.py
rename to python/ql/test/query-tests/Security/CWE-943-NoSqlInjection/pymongo_test.py