diff --git a/tests/functional/README.rst b/tests/functional/README.rst
index e73fa0e24..63ed9ef4f 100644
--- a/tests/functional/README.rst
+++ b/tests/functional/README.rst
@@ -21,7 +21,7 @@ Running functional tests (With Tox)
 
 #. Filter tests. ::
 
-   $ tox -- --tests tests.functional.test_messages
+   $ tox -- --tests tests.functional.wsgi.v1.test_messages
 
 #. Run tests for specific environments. ::
 
diff --git a/tests/functional/wsgi/__init__.py b/tests/functional/wsgi/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/functional/wsgi/v1/__init__.py b/tests/functional/wsgi/v1/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/functional/test_claims.py b/tests/functional/wsgi/v1/test_claims.py
similarity index 100%
rename from tests/functional/test_claims.py
rename to tests/functional/wsgi/v1/test_claims.py
diff --git a/tests/functional/test_messages.py b/tests/functional/wsgi/v1/test_messages.py
similarity index 100%
rename from tests/functional/test_messages.py
rename to tests/functional/wsgi/v1/test_messages.py
diff --git a/tests/functional/test_queue.py b/tests/functional/wsgi/v1/test_queues.py
similarity index 100%
rename from tests/functional/test_queue.py
rename to tests/functional/wsgi/v1/test_queues.py