diff --git a/test2/test_custom/test_custom-defaults-location.py b/test2/test_custom/test_defaults-location.py
similarity index 100%
rename from test2/test_custom/test_custom-defaults-location.py
rename to test2/test_custom/test_defaults-location.py
diff --git a/test2/test_custom/test_custom-defaults-location.yml b/test2/test_custom/test_defaults-location.yml
similarity index 100%
rename from test2/test_custom/test_custom-defaults-location.yml
rename to test2/test_custom/test_defaults-location.yml
diff --git a/test2/test_custom/test_custom-defaults.py b/test2/test_custom/test_defaults.py
similarity index 100%
rename from test2/test_custom/test_custom-defaults.py
rename to test2/test_custom/test_defaults.py
diff --git a/test2/test_custom/test_custom-defaults.yml b/test2/test_custom/test_defaults.yml
similarity index 100%
rename from test2/test_custom/test_custom-defaults.yml
rename to test2/test_custom/test_defaults.yml
diff --git a/test2/test_custom/test_custom-location-per-vhost.py b/test2/test_custom/test_location-per-vhost.py
similarity index 100%
rename from test2/test_custom/test_custom-location-per-vhost.py
rename to test2/test_custom/test_location-per-vhost.py
diff --git a/test2/test_custom/test_custom-location-per-vhost.yml b/test2/test_custom/test_location-per-vhost.yml
similarity index 100%
rename from test2/test_custom/test_custom-location-per-vhost.yml
rename to test2/test_custom/test_location-per-vhost.yml
diff --git a/test2/test_custom/test_custom-per-vhost.py b/test2/test_custom/test_per-vhost.py
similarity index 100%
rename from test2/test_custom/test_custom-per-vhost.py
rename to test2/test_custom/test_per-vhost.py
diff --git a/test2/test_custom/test_custom-per-vhost.yml b/test2/test_custom/test_per-vhost.yml
similarity index 100%
rename from test2/test_custom/test_custom-per-vhost.yml
rename to test2/test_custom/test_per-vhost.yml
diff --git a/test2/test_custom/test_custom-proxy-wide.py b/test2/test_custom/test_proxy-wide.py
similarity index 100%
rename from test2/test_custom/test_custom-proxy-wide.py
rename to test2/test_custom/test_proxy-wide.py
diff --git a/test2/test_custom/test_custom-proxy-wide.yml b/test2/test_custom/test_proxy-wide.yml
similarity index 100%
rename from test2/test_custom/test_custom-proxy-wide.yml
rename to test2/test_custom/test_proxy-wide.yml
diff --git a/test2/certs/web.nginx-proxy.tld.crt b/test2/test_headers/certs/web.nginx-proxy.tld.crt
similarity index 100%
rename from test2/certs/web.nginx-proxy.tld.crt
rename to test2/test_headers/certs/web.nginx-proxy.tld.crt
diff --git a/test2/certs/web.nginx-proxy.tld.key b/test2/test_headers/certs/web.nginx-proxy.tld.key
similarity index 100%
rename from test2/certs/web.nginx-proxy.tld.key
rename to test2/test_headers/certs/web.nginx-proxy.tld.key
diff --git a/test2/test_headers_http.py b/test2/test_headers/test_http.py
similarity index 100%
rename from test2/test_headers_http.py
rename to test2/test_headers/test_http.py
diff --git a/test2/test_headers_http.yml b/test2/test_headers/test_http.yml
similarity index 100%
rename from test2/test_headers_http.yml
rename to test2/test_headers/test_http.yml
diff --git a/test2/test_headers_https.py b/test2/test_headers/test_https.py
similarity index 100%
rename from test2/test_headers_https.py
rename to test2/test_headers/test_https.py
diff --git a/test2/test_headers_https.yml b/test2/test_headers/test_https.yml
similarity index 100%
rename from test2/test_headers_https.yml
rename to test2/test_headers/test_https.yml
diff --git a/test2/test_multiple-ports-VIRTUAL_PORT.py b/test2/test_multiple-ports/test_VIRTUAL_PORT.py
similarity index 100%
rename from test2/test_multiple-ports-VIRTUAL_PORT.py
rename to test2/test_multiple-ports/test_VIRTUAL_PORT.py
diff --git a/test2/test_multiple-ports-VIRTUAL_PORT.yml b/test2/test_multiple-ports/test_VIRTUAL_PORT.yml
similarity index 100%
rename from test2/test_multiple-ports-VIRTUAL_PORT.yml
rename to test2/test_multiple-ports/test_VIRTUAL_PORT.yml
diff --git a/test2/test_multiple-ports-default-80.py b/test2/test_multiple-ports/test_default-80.py
similarity index 100%
rename from test2/test_multiple-ports-default-80.py
rename to test2/test_multiple-ports/test_default-80.py
diff --git a/test2/test_multiple-ports-default-80.yml b/test2/test_multiple-ports/test_default-80.yml
similarity index 100%
rename from test2/test_multiple-ports-default-80.yml
rename to test2/test_multiple-ports/test_default-80.yml
diff --git a/test2/test_multiple-ports-single-port-not-80.py b/test2/test_multiple-ports/test_single-port-not-80.py
similarity index 100%
rename from test2/test_multiple-ports-single-port-not-80.py
rename to test2/test_multiple-ports/test_single-port-not-80.py
diff --git a/test2/test_multiple-ports-single-port-not-80.yml b/test2/test_multiple-ports/test_single-port-not-80.yml
similarity index 100%
rename from test2/test_multiple-ports-single-port-not-80.yml
rename to test2/test_multiple-ports/test_single-port-not-80.yml
diff --git a/test2/certs/*.nginx-proxy.tld.crt b/test2/test_ssl/certs/*.nginx-proxy.tld.crt
similarity index 100%
rename from test2/certs/*.nginx-proxy.tld.crt
rename to test2/test_ssl/certs/*.nginx-proxy.tld.crt
diff --git a/test2/certs/*.nginx-proxy.tld.key b/test2/test_ssl/certs/*.nginx-proxy.tld.key
similarity index 100%
rename from test2/certs/*.nginx-proxy.tld.key
rename to test2/test_ssl/certs/*.nginx-proxy.tld.key
diff --git a/test2/certs/web2.nginx-proxy.tld.crt b/test2/test_ssl/certs/web2.nginx-proxy.tld.crt
similarity index 100%
rename from test2/certs/web2.nginx-proxy.tld.crt
rename to test2/test_ssl/certs/web2.nginx-proxy.tld.crt
diff --git a/test2/certs/web2.nginx-proxy.tld.key b/test2/test_ssl/certs/web2.nginx-proxy.tld.key
similarity index 100%
rename from test2/certs/web2.nginx-proxy.tld.key
rename to test2/test_ssl/certs/web2.nginx-proxy.tld.key
diff --git a/test2/certs/web3.nginx-proxy.tld.crt b/test2/test_ssl/certs/web3.nginx-proxy.tld.crt
similarity index 100%
rename from test2/certs/web3.nginx-proxy.tld.crt
rename to test2/test_ssl/certs/web3.nginx-proxy.tld.crt
diff --git a/test2/certs/web3.nginx-proxy.tld.key b/test2/test_ssl/certs/web3.nginx-proxy.tld.key
similarity index 100%
rename from test2/certs/web3.nginx-proxy.tld.key
rename to test2/test_ssl/certs/web3.nginx-proxy.tld.key
diff --git a/test2/test_ssl_nohttp.py b/test2/test_ssl/test_nohttp.py
similarity index 100%
rename from test2/test_ssl_nohttp.py
rename to test2/test_ssl/test_nohttp.py
diff --git a/test2/test_ssl_nohttp.yml b/test2/test_ssl/test_nohttp.yml
similarity index 100%
rename from test2/test_ssl_nohttp.yml
rename to test2/test_ssl/test_nohttp.yml
diff --git a/test2/test_ssl_nohttps.py b/test2/test_ssl/test_nohttps.py
similarity index 100%
rename from test2/test_ssl_nohttps.py
rename to test2/test_ssl/test_nohttps.py
diff --git a/test2/test_ssl_nohttps.yml b/test2/test_ssl/test_nohttps.yml
similarity index 100%
rename from test2/test_ssl_nohttps.yml
rename to test2/test_ssl/test_nohttps.yml
diff --git a/test2/test_ssl_noredirect.py b/test2/test_ssl/test_noredirect.py
similarity index 100%
rename from test2/test_ssl_noredirect.py
rename to test2/test_ssl/test_noredirect.py
diff --git a/test2/test_ssl_noredirect.yml b/test2/test_ssl/test_noredirect.yml
similarity index 100%
rename from test2/test_ssl_noredirect.yml
rename to test2/test_ssl/test_noredirect.yml
diff --git a/test2/test_ssl_wildcard.py b/test2/test_ssl/test_wildcard.py
similarity index 100%
rename from test2/test_ssl_wildcard.py
rename to test2/test_ssl/test_wildcard.py
diff --git a/test2/test_ssl_wildcard.yml b/test2/test_ssl/test_wildcard.yml
similarity index 100%
rename from test2/test_ssl_wildcard.yml
rename to test2/test_ssl/test_wildcard.yml