diff --git a/test/test_composev2.py b/test/test_composev2.py
deleted file mode 100644
index 695857e..0000000
--- a/test/test_composev2.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import pytest
-
-def test_unknown_virtual_host(docker_compose, nginxproxy):
-    r = nginxproxy.get("http://nginx-proxy/")
-    assert r.status_code == 503
-
-def test_forwards_to_whoami(docker_compose, nginxproxy):
-    r = nginxproxy.get("http://web.nginx-proxy.example/port")
-    assert r.status_code == 200   
-    assert r.text == "answer from port 81\n"
diff --git a/test/test_composev2.yml b/test/test_composev2.yml
deleted file mode 100644
index 3c36022..0000000
--- a/test/test_composev2.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: "2"
-
-services:
-  nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-
-  web:
-    image: web
-    expose:
-      - "81"
-    environment:
-      WEB_PORTS: 81
-      VIRTUAL_HOST: web.nginx-proxy.example
diff --git a/test/test_log_format.py b/test/test_logs/test_log_format.py
similarity index 100%
rename from test/test_log_format.py
rename to test/test_logs/test_log_format.py
diff --git a/test/test_log_format.yml b/test/test_logs/test_log_format.yml
similarity index 100%
rename from test/test_log_format.yml
rename to test/test_logs/test_log_format.yml
diff --git a/test/test_log_json.py b/test/test_logs/test_log_json.py
similarity index 100%
rename from test/test_log_json.py
rename to test/test_logs/test_log_json.py
diff --git a/test/test_log_json.yml b/test/test_logs/test_log_json.yml
similarity index 100%
rename from test/test_log_json.yml
rename to test/test_logs/test_log_json.yml
diff --git a/test/test_log_json_format.py b/test/test_logs/test_log_json_format.py
similarity index 100%
rename from test/test_log_json_format.py
rename to test/test_logs/test_log_json_format.py
diff --git a/test/test_log_json_format.yml b/test/test_logs/test_log_json_format.yml
similarity index 100%
rename from test/test_log_json_format.yml
rename to test/test_logs/test_log_json_format.yml
diff --git a/test/test_multiple-ports/test_VIRTUAL_PORT-single-different-from-single-port.py b/test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.py
similarity index 100%
rename from test/test_multiple-ports/test_VIRTUAL_PORT-single-different-from-single-port.py
rename to test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.py
diff --git a/test/test_multiple-ports/test_VIRTUAL_PORT-single-different-from-single-port.yml b/test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml
similarity index 100%
rename from test/test_multiple-ports/test_VIRTUAL_PORT-single-different-from-single-port.yml
rename to test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml
diff --git a/test/test_multiple-ports/test_VIRTUAL_PORT.py b/test/test_ports/test_VIRTUAL_PORT.py
similarity index 100%
rename from test/test_multiple-ports/test_VIRTUAL_PORT.py
rename to test/test_ports/test_VIRTUAL_PORT.py
diff --git a/test/test_multiple-ports/test_VIRTUAL_PORT.yml b/test/test_ports/test_VIRTUAL_PORT.yml
similarity index 100%
rename from test/test_multiple-ports/test_VIRTUAL_PORT.yml
rename to test/test_ports/test_VIRTUAL_PORT.yml
diff --git a/test/test_multiple-ports/test_default-80.py b/test/test_ports/test_default-80.py
similarity index 100%
rename from test/test_multiple-ports/test_default-80.py
rename to test/test_ports/test_default-80.py
diff --git a/test/test_multiple-ports/test_default-80.yml b/test/test_ports/test_default-80.yml
similarity index 100%
rename from test/test_multiple-ports/test_default-80.yml
rename to test/test_ports/test_default-80.yml
diff --git a/test/test_multiple-ports/test_single-port-not-80.py b/test/test_ports/test_single-port-not-80.py
similarity index 100%
rename from test/test_multiple-ports/test_single-port-not-80.py
rename to test/test_ports/test_single-port-not-80.py
diff --git a/test/test_multiple-ports/test_single-port-not-80.yml b/test/test_ports/test_single-port-not-80.yml
similarity index 100%
rename from test/test_multiple-ports/test_single-port-not-80.yml
rename to test/test_ports/test_single-port-not-80.yml
diff --git a/test/test_default-root-none.py b/test/test_virtual-path/test_default-root-none.py
similarity index 100%
rename from test/test_default-root-none.py
rename to test/test_virtual-path/test_default-root-none.py
diff --git a/test/test_default-root-none.yml b/test/test_virtual-path/test_default-root-none.yml
similarity index 100%
rename from test/test_default-root-none.yml
rename to test/test_virtual-path/test_default-root-none.yml