diff --git a/.github/workflows/build-publish-dispatch.yml b/.github/workflows/build-publish-dispatch.yml
new file mode 100644
index 000000000..01a7b379b
--- /dev/null
+++ b/.github/workflows/build-publish-dispatch.yml
@@ -0,0 +1,85 @@
+name: Build and publish Docker images on demand
+
+on:
+  workflow_dispatch:
+    inputs:
+      image_tag:
+        description: "Image tag"
+        type: string
+        required: true
+
+jobs:
+  multiarch-build:
+    name: Build and publish ${{ matrix.base }} image with tag ${{ inputs.image_tag }}
+    strategy:
+      matrix:
+        base: [alpine, debian]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Retrieve nginx-proxy version
+        id: nginx-proxy_version
+        run: echo "VERSION=$(git describe --tags)" >> "$GITHUB_OUTPUT"
+
+      - name: Retrieve docker-gen version
+        id: docker-gen_version
+        run: sed -n -e 's;^FROM nginxproxy/docker-gen:\([0-9.]*\).*;VERSION=\1;p' Dockerfile.${{ matrix.base }} >> "$GITHUB_OUTPUT"
+
+      - name: Get Docker tags
+        id: docker_meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            nginxproxy/nginx-proxy
+          tags: |
+            type=raw,value=${{ inputs.image_tag }},enable=${{ matrix.base == 'debian' }}
+            type=raw,value=${{ inputs.image_tag }},suffix=-alpine,enable=${{ matrix.base == 'alpine' }}
+          labels: |
+            org.opencontainers.image.authors=Nicolas Duchon <nicolas.duchon@gmail.com> (@buchdag), Jason Wilder
+            org.opencontainers.image.version=${{ steps.nginx-proxy_version.outputs.VERSION }}
+          flavor: |
+            latest=false
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push the image
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfile.${{ matrix.base }}
+          build-args: |
+            NGINX_PROXY_VERSION=${{ steps.nginx-proxy_version.outputs.VERSION }}
+            DOCKER_GEN_VERSION=${{ steps.docker-gen_version.outputs.VERSION }}
+          platforms: linux/amd64,linux/arm64,linux/s390x,linux/arm/v7
+          sbom: true
+          push: true
+          provenance: mode=max
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Images digests
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 36e6273e6..60e833115 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,10 +25,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
 
       - name: Install dependencies
         run: |
@@ -36,6 +36,9 @@ jobs:
           pip install -r python-requirements.txt
         working-directory: test/requirements
 
+      - name: Pull nginx:alpine image
+        run: docker pull nginx:alpine
+
       - name: Build Docker web server image
         run: make build-webserver
 
diff --git a/.gitignore b/.gitignore
index 5daab4f78..7a6f79faa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 **/__pycache__/
 **/.cache/
 .idea/
+wip
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index c602cdfc5..e37cad87d 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -1,9 +1,9 @@
-FROM docker.io/nginxproxy/docker-gen:0.14.3 AS docker-gen
+FROM docker.io/nginxproxy/docker-gen:0.14.4 AS docker-gen
 
 FROM docker.io/nginxproxy/forego:0.18.2 AS forego
 
 # Build the final image
-FROM docker.io/library/nginx:1.27.2-alpine
+FROM docker.io/library/nginx:1.27.3-alpine
 
 ARG NGINX_PROXY_VERSION
 # Add DOCKER_GEN_VERSION environment variable because 
diff --git a/Dockerfile.debian b/Dockerfile.debian
index ec63da850..82a6ab7fc 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -1,9 +1,9 @@
-FROM docker.io/nginxproxy/docker-gen:0.14.3-debian AS docker-gen
+FROM docker.io/nginxproxy/docker-gen:0.14.4-debian AS docker-gen
 
 FROM docker.io/nginxproxy/forego:0.18.2-debian AS forego
 
 # Build the final image
-FROM docker.io/library/nginx:1.27.2
+FROM docker.io/library/nginx:1.27.3
 
 ARG NGINX_PROXY_VERSION
 # Add DOCKER_GEN_VERSION environment variable because 
diff --git a/README.md b/README.md
index 3baf33f3d..2aa38ff53 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Test](https://github.com/nginx-proxy/nginx-proxy/actions/workflows/test.yml/badge.svg)](https://github.com/nginx-proxy/nginx-proxy/actions/workflows/test.yml)
 [![GitHub release](https://img.shields.io/github/v/release/nginx-proxy/nginx-proxy)](https://github.com/nginx-proxy/nginx-proxy/releases)
-[![nginx 1.27.2](https://img.shields.io/badge/nginx-1.27.2-brightgreen.svg?logo=nginx)](https://nginx.org/en/CHANGES)
+[![nginx 1.27.3](https://img.shields.io/badge/nginx-1.27.3-brightgreen.svg?logo=nginx)](https://nginx.org/en/CHANGES)
 [![Docker Image Size](https://img.shields.io/docker/image-size/nginxproxy/nginx-proxy?sort=semver)](https://hub.docker.com/r/nginxproxy/nginx-proxy "Click to view the image on Docker Hub")
 [![Docker stars](https://img.shields.io/docker/stars/nginxproxy/nginx-proxy.svg)](https://hub.docker.com/r/nginxproxy/nginx-proxy "DockerHub")
 [![Docker pulls](https://img.shields.io/docker/pulls/nginxproxy/nginx-proxy.svg)](https://hub.docker.com/r/nginxproxy/nginx-proxy "DockerHub")
@@ -59,12 +59,19 @@ This image is based on the nginx:alpine image.
 docker pull nginxproxy/nginx-proxy:1.6-alpine
 ```
 
-#### :warning: a note on `latest` and `alpine`:
-
-It is not recommended to use the `latest` (`nginxproxy/nginx-proxy`, `nginxproxy/nginx-proxy:latest`) or `alpine` (`nginxproxy/nginx-proxy:alpine`) tag for production setups.
-
-[Those tags point](https://hub.docker.com/r/nginxproxy/nginx-proxy/tags) to the latest commit in the `main` branch. They do not carry any promise of stability, and using them will probably put your nginx-proxy setup at risk of experiencing uncontrolled updates to non backward compatible versions (or versions with breaking changes). You should always specify the version you want to use explicitly to ensure your setup doesn't break when the image is updated.
+> [!IMPORTANT]
+>
+> #### A note on `latest` and `alpine`:
+>
+> It is not recommended to use the `latest` (`nginxproxy/nginx-proxy`, `nginxproxy/nginx-proxy:latest`) or `alpine` (`nginxproxy/nginx-proxy:alpine`) tag for production setups.
+>
+> [Those tags point](https://hub.docker.com/r/nginxproxy/nginx-proxy/tags) to the latest commit in the `main` branch. They do not carry any promise of stability, and using them will probably put your nginx-proxy setup at risk of experiencing uncontrolled updates to non backward compatible versions (or versions with breaking changes). You should always specify the version you want to use explicitly to ensure your setup doesn't break when the image is updated.
 
 ### Additional documentation
 
 Please check the [docs section](https://github.com/nginx-proxy/nginx-proxy/tree/main/docs).
+
+### Powered by 
+
+[![GoLand logo](https://resources.jetbrains.com/storage/products/company/brand/logos/GoLand_icon.svg)](https://www.jetbrains.com/go/)
+[![PyCharm logo](https://resources.jetbrains.com/storage/products/company/brand/logos/PyCharm_icon.svg)](https://www.jetbrains.com/pycharm/)
diff --git a/docker-compose-separate-containers.yml b/docker-compose-separate-containers.yml
index 5a6489596..3ceea451d 100644
--- a/docker-compose-separate-containers.yml
+++ b/docker-compose-separate-containers.yml
@@ -1,4 +1,5 @@
-version: "2"
+volumes:
+  nginx_conf:
 
 services:
   nginx:
@@ -7,17 +8,15 @@ services:
     ports:
       - "80:80"
     volumes:
-      - /etc/nginx/conf.d
+      - nginx_conf:/etc/nginx/conf.d:ro
 
   dockergen:
     image: nginxproxy/docker-gen
-    command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl
-      /etc/nginx/conf.d/default.conf
-    volumes_from:
-      - nginx
+    command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
+      - nginx_conf:/etc/nginx/conf.d
 
   whoami:
     image: jwilder/whoami
diff --git a/docker-compose.yml b/docker-compose.yml
index a261ffce0..a26375500 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx-proxy:
     image: nginxproxy/nginx-proxy
diff --git a/docs/README.md b/docs/README.md
index ecbd724a5..7bc6f12ef 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -56,7 +56,7 @@ For each host defined into `VIRTUAL_HOST`, the associated virtual port is retrie
 
 ### Multiple ports
 
-If your container expose more than one service on different ports and those services need to be proxied, you'll need to use the `VIRTUAL_HOST_MULTIPORTS` environment variable. This variable takes virtual host, path, port and dest definition in YAML (or JSON) form, and completely override the `VIRTUAL_HOST`, `VIRTUAL_PORT`, `VIRTUAL_PATH` and `VIRTUAL_DEST` environment variables on this container.
+If your container expose more than one service on different ports and those services need to be proxied, you'll need to use the `VIRTUAL_HOST_MULTIPORTS` environment variable. This variable takes virtual host, path, port and dest definition in YAML (or JSON) form, and completely override the `VIRTUAL_HOST`, `VIRTUAL_PORT`, `VIRTUAL_PROTO`, `VIRTUAL_PATH` and `VIRTUAL_DEST` environment variables on this container.
 
 The YAML syntax should be easier to write on Docker compose files, while the JSON syntax can be used for CLI invocation.
 
@@ -66,19 +66,21 @@ The expected format is the following:
 hostname:
   path:
     port: int
+    proto: string
     dest: string
 ```
 
-For each hostname entry, `path`, `port` and `dest` are optional and are assigned default values when missing:
+For each hostname entry, `path`, `port`, `proto` and `dest` are optional and are assigned default values when missing:
 
 - `path` = "/"
 - `port` = default port
+- `proto` = "http"
 - `dest` = ""
 
-The following examples use an hypothetical container running services on port 80, 8000 and 9000:
-
 #### Multiple ports routed to different hostnames
 
+The following example use an hypothetical container running services over HTTP on port 80, 8000 and 9000:
+
 ```yaml
 services:
   multiport-container:
@@ -111,12 +113,14 @@ services:
 
 This would result in the following proxy config:
 
-- `www.example.org` -> `multiport-container:80`
-- `service1.example.org` -> `multiport-container:8000`
-- `service2.example.org` -> `multiport-container:9000`
+- `www.example.org` -> `multiport-container:80` over `HTTP`
+- `service1.example.org` -> `multiport-container:8000` over `HTTP`
+- `service2.example.org` -> `multiport-container:9000` over `HTTP`
 
 #### Multiple ports routed to same hostname and different paths
 
+The following example use an hypothetical container running services over HTTP on port 80 and 8000 and over HTTPS on port 9443:
+
 ```yaml
 services:
   multiport-container:
@@ -130,11 +134,12 @@ services:
             port: 8000
             dest: "/"
           "/service2":
-            port: 9000
+            port: 9443
+            proto: "https"
             dest: "/"
 
-# port and dest are not specified on the / path, so this path is routed
-# to the default port with the default dest value (empty string)
+# port and dest are not specified on the / path, so this path is routed to the
+# default port with the default dest value (empty string) and default proto (http)
 
 # JSON equivalent:
 #     VIRTUAL_HOST_MULTIPORTS: |-
@@ -142,16 +147,16 @@ services:
 #         "www.example.org": {
 #           "/": {},
 #           "/service1": { "port": 8000, "dest": "/" },
-#           "/service2": { "port": 9000, "dest": "/" }
+#           "/service2": { "port": 9443, "proto": "https", "dest": "/" }
 #         }
 #       }
 ```
 
 This would result in the following proxy config:
 
-- `www.example.org` -> `multiport-container:80`
-- `www.example.org/service1` -> `multiport-container:8000`
-- `www.example.org/service2` -> `multiport-container:9000`
+- `www.example.org` -> `multiport-container:80` over `HTTP`
+- `www.example.org/service1` -> `multiport-container:8000` over `HTTP`
+- `www.example.org/service2` -> `multiport-container:9443` over `HTTPS`
 
 ⬆️ [back to table of contents](#table-of-contents)
 
@@ -162,7 +167,8 @@ It is also possible to specify multiple paths with regex locations like `VIRTUAL
 
 The full request URI will be forwarded to the serving container in the `X-Original-URI` header.
 
-**NOTE**: Your application needs to be able to generate links starting with `VIRTUAL_PATH`. This can be achieved by it being natively on this path or having an option to prepend this path. The application does not need to expect this path in the request.
+> [!NOTE]
+> Your application needs to be able to generate links starting with `VIRTUAL_PATH`. This can be achieved by it being natively on this path or having an option to prepend this path. The application does not need to expect this path in the request.
 
 ### VIRTUAL_DEST
 
@@ -242,7 +248,7 @@ Proxyed containers running in host network mode **must** use the [`VIRTUAL_PORT`
 
 If you allow traffic from the public internet to access your `nginx-proxy` container, you may want to restrict some containers to the internal network only, so they cannot be accessed from the public internet. On containers that should be restricted to the internal network, you should set the environment variable `NETWORK_ACCESS=internal`. By default, the _internal_ network is defined as `127.0.0.0/8, 10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16`. To change the list of networks considered internal, mount a file on the `nginx-proxy` at `/etc/nginx/network_internal.conf` with these contents, edited to suit your needs:
 
-```Nginx
+```nginx
 # These networks are considered "internal"
 allow 127.0.0.0/8;
 allow 10.0.0.0/8;
@@ -255,6 +261,7 @@ deny all;
 
 When internal-only access is enabled, external clients will be denied with an `HTTP 403 Forbidden`
 
+> [!NOTE]
 > If there is a load-balancer / reverse proxy in front of `nginx-proxy` that hides the client IP (example: AWS Application/Elastic Load Balancer), you will need to use the nginx `realip` module (already installed) to extract the client's IP from the HTTP request headers. Please see the [nginx realip module configuration](http://nginx.org/en/docs/http/ngx_http_realip_module.html) for more details. This configuration can be added to a new config file and mounted in `/etc/nginx/conf.d/`.
 
 ⬆️ [back to table of contents](#table-of-contents)
@@ -265,7 +272,8 @@ When internal-only access is enabled, external clients will be denied with an `H
 
 If you would like the reverse proxy to connect to your backend using HTTPS instead of HTTP, set `VIRTUAL_PROTO=https` on the backend container.
 
-> Note: If you use `VIRTUAL_PROTO=https` and your backend container exposes port 80 and 443, `nginx-proxy` will use HTTPS on port 80. This is almost certainly not what you want, so you should also include `VIRTUAL_PORT=443`.
+> [!NOTE]
+> If you use `VIRTUAL_PROTO=https` and your backend container exposes port 80 and 443, `nginx-proxy` will use HTTPS on port 80. This is almost certainly not what you want, so you should also include `VIRTUAL_PORT=443`.
 
 ### uWSGI Upstream
 
@@ -281,12 +289,9 @@ If you use fastcgi,you can set `VIRTUAL_ROOT=xxx` for your root directory
 
 ### Upstream Server HTTP Load Balancing Support
 
-> **Warning**
-> This feature is experimental. The behavior may change (or the feature may be removed entirely) without warning in a future release, even if the release is not a new major version. If you use this feature, or if you would like to use this feature but you require changes to it first, please [provide feedback in #2195](https://github.com/nginx-proxy/nginx-proxy/discussions/2195). Once we have collected enough feedback we will promote this feature to officially supported.
-
 If you have multiple containers with the same `VIRTUAL_HOST` and `VIRTUAL_PATH` settings, nginx will spread the load across all of them. To change the load balancing algorithm from nginx's default (round-robin), set the `com.github.nginx-proxy.nginx-proxy.loadbalance` label on one or more of your application containers to the desired load balancing directive. See the [`ngx_http_upstream_module` documentation](https://nginx.org/en/docs/http/ngx_http_upstream_module.html) for available directives.
 
-> **Note**
+> [!NOTE]
 >
 > - Don't forget the terminating semicolon (`;`).
 > - If you are using Docker Compose, remember to escape any dollar sign (`$`) characters (`$` becomes `$$`).
@@ -303,6 +308,7 @@ services:
       - /var/run/docker.sock:/tmp/docker.sock:ro
     environment:
       HTTPS_METHOD: nohttps
+
   myapp:
     image: jwilder/whoami
     expose:
@@ -318,10 +324,7 @@ services:
 
 ### Upstream Server HTTP Keep-Alive Support
 
-> **Warning**
-> This feature is experimental. The behavior may change (or the feature may be removed entirely) without warning in a future release, even if the release is not a new major version. If you use this feature, or if you would like to use this feature but you require changes to it first, please [provide feedback in #2194](https://github.com/nginx-proxy/nginx-proxy/discussions/2194). Once we have collected enough feedback we will promote this feature to officially supported.
-
-To enable HTTP keep-alive between `nginx-proxy` and backend server(s), set the `com.github.nginx-proxy.nginx-proxy.keepalive` label on the server's container either to `auto` or to the desired maximum number of idle connections. The `auto` setting will dynamically set the maximum number of idle connections to twice the number of servers listed in the corresponding `upstream{}` block, [per nginx recommendation](https://www.nginx.com/blog/avoiding-top-10-nginx-configuration-mistakes/#no-keepalives).
+By default `nginx-proxy` will enable HTTP keep-alive between itself and backend server(s) and set the maximum number of idle connections to twice the number of servers listed in the corresponding `upstream{}` block, [per nginx recommendation](https://www.nginx.com/blog/avoiding-top-10-nginx-configuration-mistakes/#no-keepalives). To manually set the maximum number of idle connections or disable HTTP keep-alive entirely, use the `com.github.nginx-proxy.nginx-proxy.keepalive` label on the server's container (setting it to `disabled` will disable HTTP keep-alive).
 
 See the [nginx keepalive documentation](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#keepalive) and the [Docker label documentation](https://docs.docker.com/config/labels-custom-metadata/) for details.
 
@@ -406,7 +409,7 @@ docker run --detach \
 
 ## SSL Support
 
-SSL is supported using single host, wildcard and SNI certificates using naming conventions for certificates or optionally specifying a cert name (for SNI) as an environment variable.
+SSL is supported using single host, wildcard and SAN certificates using naming conventions for certificates or optionally [specifying a cert name as an environment variable](#san-certificates).
 
 To enable SSL:
 
@@ -434,7 +437,8 @@ By default nginx-proxy generates location blocks to handle ACME HTTP Challenge.
 
 To use custom `dhparam.pem` files per-virtual-host, the files should be named after the virtual host with a `dhparam` suffix and `.pem` extension. For example, a container with `VIRTUAL_HOST=foo.bar.com` should have a `foo.bar.com.dhparam.pem` file in the `/etc/nginx/certs` directory.
 
-> COMPATIBILITY WARNING: The default generated `dhparam.pem` key is 4096 bits for A+ security. Some older clients (like Java 6 and 7) do not support DH keys with over 1024 bits. In order to support these clients, you must provide your own `dhparam.pem`.
+> [!WARNING]
+> The default generated `dhparam.pem` key is 4096 bits for A+ security. Some older clients (like Java 6 and 7) do not support DH keys with over 1024 bits. In order to support these clients, you must provide your own `dhparam.pem`.
 
 In the separate container setup, no pre-generated key will be available and neither the [nginxproxy/docker-gen](https://hub.docker.com/r/nginxproxy/docker-gen) image, nor the offical [nginx](https://registry.hub.docker.com/_/nginx/) image will provide one. If you still want A+ security in a separate container setup, you should mount an RFC7919 DH key file to the nginx container at `/etc/nginx/dhparam/dhparam.pem`.
 
@@ -446,9 +450,12 @@ docker run -e DHPARAM_SKIP=true ....
 
 ### Wildcard Certificates
 
-Wildcard certificates and keys should be named after the domain name with a `.crt` and `.key` extension. For example `VIRTUAL_HOST=foo.bar.com` would use cert name `bar.com.crt` and `bar.com.key`.
+Wildcard certificates and keys should be named after the parent domain name with a `.crt` and `.key` extension. For example:
 
-### SNI
+- `VIRTUAL_HOST=foo.bar.com` would use cert name `bar.com.crt` and `bar.com.key` if `foo.bar.com.crt` and `foo.bar.com.key` are not available
+- `VIRTUAL_HOST=sub.foo.bar.com` use cert name `foo.bar.com.crt` and `foo.bar.com.key` if `sub.foo.bar.com.crt` and `sub.foo.bar.com.key` are not available, but won't use `bar.com.crt` and `bar.com.key`.
+
+### SAN Certificates
 
 If your certificate(s) supports multiple domain names, you can start a container with `CERT_NAME=<name>` to identify the certificate to be used. For example, a certificate for `*.foo.com` and `*.bar.com` could be named `shared.crt` and `shared.key`. A container running with `VIRTUAL_HOST=foo.bar.com` and `CERT_NAME=shared` will then use this shared cert.
 
@@ -460,7 +467,10 @@ To enable OCSP Stapling for a domain, `nginx-proxy` looks for a PEM certificate
 
 The default SSL cipher configuration is based on the [Mozilla intermediate profile](https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29) version 5.0 which should provide compatibility with clients back to Firefox 27, Android 4.4.2, Chrome 31, Edge, IE 11 on Windows 7, Java 8u31, OpenSSL 1.0.1, Opera 20, and Safari 9. Note that the DES-based TLS ciphers were removed for security. The configuration also enables HSTS, PFS, OCSP stapling and SSL session caches. Currently TLS 1.2 and 1.3 are supported.
 
-If you don't require backward compatibility, you can use the [Mozilla modern profile](https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility) profile instead by including the environment variable `SSL_POLICY=Mozilla-Modern` to the nginx-proxy container or to your container. This profile is compatible with clients back to Firefox 63, Android 10.0, Chrome 70, Edge 75, Java 11, OpenSSL 1.1.1, Opera 57, and Safari 12.1. Note that this profile is **not** compatible with any version of Internet Explorer.
+If you don't require backward compatibility, you can use the [Mozilla modern profile](https://wiki.mozilla.org/Security/Server_Side_TLS#Modern_compatibility) profile instead by including the environment variable `SSL_POLICY=Mozilla-Modern` to the nginx-proxy container or to your container. This profile is compatible with clients back to Firefox 63, Android 10.0, Chrome 70, Edge 75, Java 11, OpenSSL 1.1.1, Opera 57, and Safari 12.1.
+
+> [!NOTE]
+> This profile is **not** compatible with any version of Internet Explorer.
 
 Complete list of policies available through the `SSL_POLICY` environment variable, including the [AWS ELB Security Policies](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/create-https-listener.html#describe-ssl-policies) and [AWS Classic ELB security policies](https://docs.aws.amazon.com/fr_fr/elasticloadbalancing/latest/classic/elb-security-policy-table.html):
 
@@ -567,24 +577,26 @@ Complete list of policies available through the `SSL_POLICY` environment variabl
 The default behavior for the proxy when port 80 and 443 are exposed is as follows:
 
 - If a virtual host has a usable cert, port 80 will redirect to 443 for that virtual host so that HTTPS is always preferred when available.
-- If the virtual host does not have a usable cert, but `default.crt` and `default.key` exist, those will be used as the virtual host's certificate and the client browser will receive a 500 error.
-- If the virtual host does not have a usable cert, and `default.crt` and `default.key` do not exist, SSL handshake will be rejected (see [Missing Certificate](#missing-certificate) below).
+- If the virtual host does not have a usable cert, but `default.crt` and `default.key` exist, those will be used as the virtual host's certificate.
+- If the virtual host does not have a usable cert, and `default.crt` and `default.key` do not exist, or if the virtual host is configured not to trust the default certificate, SSL handshake will be rejected (see [Default and Missing Certificate](#default-and-missing-certificate) below).
+
+The redirection from HTTP to HTTPS use by default a [`301`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/301) response for every HTTP methods (except `CONNECT` and `TRACE` which are disabled on nginx). If you wish to use a custom redirection response for the `OPTIONS`, `POST`, `PUT`, `PATCH` and `DELETE` HTTP methods, you can either do it globally with the environment variable `NON_GET_REDIRECT` on the proxy container or per virtual host with the `com.github.nginx-proxy.nginx-proxy.non-get-redirect` label on proxied containers. Valid values are [`307`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/307) and [`308`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/308).
 
 To serve traffic in both SSL and non-SSL modes without redirecting to SSL, you can include the environment variable `HTTPS_METHOD=noredirect` (the default is `HTTPS_METHOD=redirect`). You can also disable the non-SSL site entirely with `HTTPS_METHOD=nohttp`, or disable the HTTPS site with `HTTPS_METHOD=nohttps`. `HTTPS_METHOD` can be specified on each container for which you want to override the default behavior or on the proxy container to set it globally. If `HTTPS_METHOD=noredirect` is used, Strict Transport Security (HSTS) is disabled to prevent HTTPS users from being redirected by the client. If you cannot get to the HTTP site after changing this setting, your browser has probably cached the HSTS policy and is automatically redirecting you back to HTTPS. You will need to clear your browser's HSTS cache or use an incognito window / different browser.
 
 By default, [HTTP Strict Transport Security (HSTS)](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Strict-Transport-Security) is enabled with `max-age=31536000` for HTTPS sites. You can disable HSTS with the environment variable `HSTS=off` or use a custom HSTS configuration like `HSTS=max-age=31536000; includeSubDomains; preload`.
 
-_WARNING_: HSTS will force your users to visit the HTTPS version of your site for the `max-age` time - even if they type in `http://` manually. The only way to get to an HTTP site after receiving an HSTS response is to clear your browser's HSTS cache.
+> [!WARNING]
+> HSTS will force your users to visit the HTTPS version of your site for the max-age time - even if they type in http:// manually. The only way to get to an HTTP site after receiving an HSTS response is to clear your browser's HSTS cache.
 
-### Missing Certificate
+### Default and Missing Certificate
 
-If no matching certificate is found for a given virtual host, nginx-proxy will:
+If no matching certificate is found for a given virtual host, nginx-proxy will configure nginx to use the default certificate (`default.crt` with `default.key`).
 
-- configure nginx to use the default certificate (`default.crt` with `default.key`) and return a 500 error for HTTPS,
-- force enable HTTP; i.e. `HTTPS_METHOD` will switch to `noredirect` if it was set to `nohttp` or `redirect`.
-  If this switch to HTTP is not wanted set `ENABLE_HTTP_ON_MISSING_CERT=false` (default is `true`).
+If the default certificate is also missing, nginx-proxy will:
 
-If the default certificate is also missing, nginx-proxy will configure nginx to reject the SSL handshake. Client browsers will render a TLS error page. As of October 2024, web browsers display the following error messages:
+- force enable HTTP; i.e. `HTTPS_METHOD` will switch to `noredirect` if it was set to `nohttp` or `redirect`. If this switch to HTTP is not wanted set `ENABLE_HTTP_ON_MISSING_CERT=false` (default is `true`).
+- configure nginx to reject the SSL handshake for this vhost. Client browsers will render a TLS error page. As of October 2024, web browsers display the following error messages:
 
 #### Chrome:
 
@@ -606,16 +618,47 @@ If the default certificate is also missing, nginx-proxy will configure nginx to
 > - Please contact the website owners to inform them of this problem.
 
 #### Safari:
-  
+
 > Safari Can't Open the Page
 >
 > Safari can't open the page "https://example.test" because Safari can't establish a secure connection to the server "example.test".
 
+> [!NOTE]
+> Prior to version `1.7`, nginx-proxy never trusted the default certificate: when the default certificate was present, virtual hosts that did not have a usable per-virtual-host cert used the default cert but always returned a 500 error over HTTPS. If you want to restore this behaviour, you can do it globally by setting the enviroment variable `TRUST_DEFAULT_CERT` to `false` on the proxy container, or per-virtual-host by setting the label `com.github.nginx-proxy.nginx-proxy.trust-default-cert`to `false` on a proxied container.
+
+### Certificate selection
+
+Summarizing all the above informations, nginx-proxy will select the certificate for a given virtual host using the following sequence:
+
+1. if `CERT_NAME` is used, nginx-proxy will use the corresponding certificate if it exists (eg `foor.bar.com` → `CERT_NAME.crt`), or disable HTTPS for this virtual host if it does not. See [SAN certificates](#san-certificates).
+2. if a certificate exactly matching the virtual host hostname exist, nginx-proxy will use it (eg `foo.bar.com` → `foo.bar.com.crt`).
+3. if the virtual host hostname is a subdomain (eg `foo.bar.com` but not `bar.com`) and a certificate exactly matching its parent domain exist , nginx-proxy will use it (eg `foor.bar.com` → `bar.com.crt`). See [wildcard certificates](#wildcard-certificates).
+4. if the default certificate (`default.crt`) exist and is trusted, nginx-proxy will use it (eg `foor.bar.com` → `default.crt`). See [default and missing certificate](#default-and-missing-certificate).
+5. if the default certificate does not exist or isn't trusted, nginx-proxy will disable HTTPS for this virtual host (eg `foor.bar.com` → no HTTPS).
+
+> [!IMPORTANT]
+> Using `CERT_NAME` take precedence over the certificate selection process, meaning nginx-proxy will not auto select a correct certificate in step 2 trough 5 if `CERT_NAME` was used with an incorrect value or without corresponding certificate.
+
+> [!NOTE]
+> In all the above cases, if a private key file corresponding to the selected certificate (eg `foo.bar.com.key` for the `foor.bar.com.crt` certificate) does not exist, HTTPS will be disabled for this virtual host.
+
 ⬆️ [back to table of contents](#table-of-contents)
 
 ## IPv6 Support
 
-You can activate the IPv6 support for the nginx-proxy container by passing the value `true` to the `ENABLE_IPV6` environment variable:
+### IPv6 Docker Networks
+
+nginx-proxy support both IPv4 and IPv6 on Docker networks.
+
+By default nginx-proxy will prefer IPv4: if a container can be reached over both IPv4 and IPv6, only its IPv4 will be used.
+
+This can be changed globally by setting the environment variable `PREFER_IPV6_NETWORK` to `true` on the proxy container: with this setting the proxy will only use IPv6 for containers that can be reached over both IPv4 and IPv6.
+
+IPv4 and IPv6 are never both used at the same time on containers that use both IP stacks to avoid artificially inflating the effective round robin weight of those containers.
+
+### Listening on IPv6
+
+By default the nginx-proxy container will only listen on IPv4. To enable listening on IPv6 too, set the `ENABLE_IPV6` environment variable to `true`:
 
 ```console
 docker run -d -p 80:80 -e ENABLE_IPV6=true -v /var/run/docker.sock:/tmp/docker.sock:ro nginxproxy/nginx-proxy
@@ -645,7 +688,7 @@ More reading on the potential TCP head-of-line blocking issue with HTTP/2: [HTTP
 
 ### HTTP/3 support
 
-> **Warning**
+> [!WARNING]
 > HTTP/3 support [is still considered experimental in nginx](https://www.nginx.com/blog/binary-packages-for-preview-nginx-quic-http3-implementation/) and as such is considered experimental in nginx-proxy too and is disabled by default. [Feedbacks for the HTTP/3 support are welcome in #2271.](https://github.com/nginx-proxy/nginx-proxy/discussions/2271)
 
 HTTP/3 use the QUIC protocol over UDP (unlike HTTP/1.1 and HTTP/2 which work over TCP), so if you want to use HTTP/3 you'll have to explicitely publish the 443/udp port of the proxy in addition to the 443/tcp port:
@@ -697,7 +740,7 @@ If you need to configure Nginx beyond what is possible using environment variabl
 
 If you want to replace the default proxy settings for the nginx container, add a configuration file at `/etc/nginx/proxy.conf`. A file with the default settings would look like this:
 
-```Nginx
+```nginx
 # HTTP 1.1 support
 proxy_http_version 1.1;
 proxy_set_header Host $http_host;
@@ -715,7 +758,8 @@ proxy_set_header X-Original-URI $request_uri;
 proxy_set_header Proxy "";
 ```
 
-**_NOTE_**: If you provide this file it will replace the defaults; you may want to check the [nginx.tmpl](https://github.com/nginx-proxy/nginx-proxy/blob/main/nginx.tmpl) file to make sure you have all of the needed options.
+> [!IMPORTANT]
+> If you provide this file it will replace the defaults; you may want to check the [nginx.tmpl](https://github.com/nginx-proxy/nginx-proxy/blob/main/nginx.tmpl) file to make sure you have all of the needed options.
 
 ### Proxy-wide
 
@@ -731,12 +775,47 @@ RUN { \
     } > /etc/nginx/conf.d/my_proxy.conf
 ```
 
-Or it can be done by mounting in your custom configuration in your `docker run` command:
+Or it can be done by mounting in your custom configuration in your `docker run` command or your Docker Compose file:
+
+```nginx
+# content of the my_proxy.conf file
+server_tokens off;
+client_max_body_size 100m;
+```
+
+<details>
+  <summary>Docker CLI</summary>
 
 ```console
-docker run -d -p 80:80 -p 443:443 -v /path/to/my_proxy.conf:/etc/nginx/conf.d/my_proxy.conf:ro -v /var/run/docker.sock:/tmp/docker.sock:ro nginxproxy/nginx-proxy
+docker run --detach \
+  --name nginx-proxy \
+  --publish 80:80 \
+  --publish 443:443 \
+  --volume /var/run/docker.sock:/tmp/docker.sock:ro \
+  --volume /path/to/my_proxy.conf:/etc/nginx/conf.d/my_proxy.conf:ro \
+  nginxproxy/nginx-proxy
+```
+
+</details>
+
+<details>
+  <summary>Docker Compose file</summary>
+
+```yaml
+services:
+  proxy:
+    image: nginxproxy/nginx-proxy
+    container_name: nginx-proxy
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - /path/to/my_proxy.conf:/etc/nginx/conf.d/my_proxy.conf:ro
 ```
 
+</details>
+
 ### Per-VIRTUAL_HOST
 
 To add settings on a per-`VIRTUAL_HOST` basis, add your configuration file under `/etc/nginx/vhost.d`. Unlike in the proxy-wide case, which allows multiple config files with any name ending in `.conf`, the per-`VIRTUAL_HOST` file must be named exactly after the `VIRTUAL_HOST`, or if `VIRTUAL_HOST` is a regex, after the sha1 hash of the regex.
@@ -745,21 +824,87 @@ In order to allow virtual hosts to be dynamically configured as backends are add
 
 For example, if you have a virtual host named `app.example.com`, you could provide a custom configuration for that host as follows:
 
+1. create your virtual host config file:
+
+```nginx
+# content of the custom-vhost-config.conf file
+client_max_body_size 100m;
+```
+
+2. mount it to `/etc/nginx/vhost.d/app.example.com`:
+<details>
+  <summary>Docker CLI</summary>
+
 ```console
-docker run -d -p 80:80 -p 443:443 -v /path/to/vhost.d:/etc/nginx/vhost.d:ro -v /var/run/docker.sock:/tmp/docker.sock:ro nginxproxy/nginx-proxy
-{ echo 'server_tokens off;'; echo 'client_max_body_size 100m;'; } > /path/to/vhost.d/app.example.com
+docker run --detach \
+  --name nginx-proxy \
+  --publish 80:80 \
+  --publish 443:443 \
+  --volume /var/run/docker.sock:/tmp/docker.sock:ro \
+  --volume /path/to/custom-vhost-config.conf:/etc/nginx/vhost.d/app.example.com:ro \
+  nginxproxy/nginx-proxy
+```
+
+</details>
+
+<details>
+  <summary>Docker Compose file</summary>
+
+```yaml
+services:
+  proxy:
+    image: nginxproxy/nginx-proxy
+    container_name: nginx-proxy
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - /path/to/custom-vhost-config.conf:/etc/nginx/vhost.d/app.example.com:ro
 ```
 
-If you are using multiple hostnames for a single container (e.g. `VIRTUAL_HOST=example.com,www.example.com`), the virtual host configuration file must exist for each hostname. If you would like to use the same configuration for multiple virtual host names, you can use a symlink:
+</details>
+
+If you are using multiple hostnames for a single container (e.g. `VIRTUAL_HOST=example.com,www.example.com`), the virtual host configuration file must exist for each hostname:
+
+<details>
+  <summary>Docker CLI</summary>
 
 ```console
-{ echo 'server_tokens off;'; echo 'client_max_body_size 100m;'; } > /path/to/vhost.d/www.example.com
-ln -s /path/to/vhost.d/www.example.com /path/to/vhost.d/example.com
+docker run --detach \
+  --name nginx-proxy \
+  --publish 80:80 \
+  --publish 443:443 \
+  --volume /path/to/custom-vhost-config.conf:/etc/nginx/vhost.d/example.com:ro \
+  --volume /path/to/custom-vhost-config.conf:/etc/nginx/vhost.d/www.example.com:ro \
+  --volume /var/run/docker.sock:/tmp/docker.sock:ro \
+  nginxproxy/nginx-proxy
+```
+
+</details>
+
+<details>
+  <summary>Docker Compose file</summary>
+
+```yaml
+services:
+  proxy:
+    image: nginxproxy/nginx-proxy
+    container_name: nginx-proxy
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - /path/to/custom-vhost-config.conf:/etc/nginx/vhost.d/example.com:ro
+      - /path/to/custom-vhost-config.conf:/etc/nginx/vhost.d/www.example.com:ro
 ```
 
+</details>
+
 ### Per-VIRTUAL_HOST default configuration
 
-If you want most of your virtual hosts to use a default single configuration and then override on a few specific ones, add those settings to the `/etc/nginx/vhost.d/default` file. This file will be used on any virtual host which does not have a `/etc/nginx/vhost.d/{VIRTUAL_HOST}` file associated with it.
+If you want most of your virtual hosts to use a default single configuration and then override on a few specific ones, add those settings to the `/etc/nginx/vhost.d/default` file. This file will be used on any virtual host which does not have a [per-VIRTUAL_HOST file](#per-virtual_host) associated with it.
 
 ### Per-VIRTUAL_HOST location configuration
 
@@ -767,21 +912,90 @@ To add settings to the "location" block on a per-`VIRTUAL_HOST` basis, add your
 
 For example, if you have a virtual host named `app.example.com` and you have configured a proxy_cache `my-cache` in another custom file, you could tell it to use a proxy cache as follows:
 
+1. create your virtual host location config file:
+
+```nginx
+# content of the custom-vhost-location-config.conf file
+proxy_cache my-cache;
+proxy_cache_valid 200 302 60m;
+proxy_cache_valid 404 1m;
+```
+
+2. mount it to `/etc/nginx/vhost.d/app.example.com_location`:
+
+<details>
+  <summary>Docker CLI</summary>
+
 ```console
-docker run -d -p 80:80 -p 443:443 -v /path/to/vhost.d:/etc/nginx/vhost.d:ro -v /var/run/docker.sock:/tmp/docker.sock:ro nginxproxy/nginx-proxy
-{ echo 'proxy_cache my-cache;'; echo 'proxy_cache_valid  200 302  60m;'; echo 'proxy_cache_valid  404 1m;' } > /path/to/vhost.d/app.example.com_location
+docker run --detach \
+  --name nginx-proxy \
+  --publish 80:80 \
+  --publish 443:443 \
+  --volume /var/run/docker.sock:/tmp/docker.sock:ro \
+  --volume /path/to/custom-vhost-location-config.conf:/etc/nginx/vhost.d/app.example.com_location:ro \
+  nginxproxy/nginx-proxy
 ```
 
-If you are using multiple hostnames for a single container (e.g. `VIRTUAL_HOST=example.com,www.example.com`), the virtual host configuration file must exist for each hostname. If you would like to use the same configuration for multiple virtual host names, you can use a symlink:
+</details>
+
+<details>
+  <summary>Docker Compose file</summary>
+
+```yaml
+services:
+  proxy:
+    image: nginxproxy/nginx-proxy
+    container_name: nginx-proxy
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - /path/to/custom-vhost-location-config.conf:/etc/nginx/vhost.d/app.example.com_location:ro
+```
+
+</details>
+
+If you are using multiple hostnames for a single container (e.g. `VIRTUAL_HOST=example.com,www.example.com`), the virtual host configuration file must exist for each hostname:
+
+<details>
+  <summary>Docker CLI</summary>
 
 ```console
-{ echo 'proxy_cache my-cache;'; echo 'proxy_cache_valid  200 302  60m;'; echo 'proxy_cache_valid  404 1m;' } > /path/to/vhost.d/app.example.com_location
-ln -s /path/to/vhost.d/www.example.com /path/to/vhost.d/example.com
+docker run --detach \
+  --name nginx-proxy \
+  --publish 80:80 \
+  --publish 443:443 \
+  --volume /var/run/docker.sock:/tmp/docker.sock:ro \
+  --volume /path/to/custom-vhost-location-config.conf:/etc/nginx/vhost.d/example.com_location:ro \
+  --volume /path/to/custom-vhost-location-config.conf:/etc/nginx/vhost.d/www.example.com_location:ro \
+  nginxproxy/nginx-proxy
+```
+
+</details>
+
+<details>
+  <summary>Docker Compose file</summary>
+
+```yaml
+services:
+  proxy:
+    image: nginxproxy/nginx-proxy
+    container_name: nginx-proxy
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - /path/to/custom-vhost-location-config.conf:/etc/nginx/vhost.d/example.com_location:ro
+      - /path/to/custom-vhost-location-config.conf:/etc/nginx/vhost.d/www.example.com_location:ro
 ```
 
+</details>
+
 ### Per-VIRTUAL_HOST location default configuration
 
-If you want most of your virtual hosts to use a default single `location` block configuration and then override on a few specific ones, add those settings to the `/etc/nginx/vhost.d/default_location` file. This file will be used on any virtual host which does not have a `/etc/nginx/vhost.d/{VIRTUAL_HOST}_location` file associated with it.
+If you want most of your virtual hosts to use a default single `location` block configuration and then override on a few specific ones, add those settings to the `/etc/nginx/vhost.d/default_location` file. This file will be used on any virtual host which does not have a [Per-VIRTUAL_HOST location file](#per-virtual_host-location-configuration) associated with it.
 
 ### Overriding `location` blocks
 
@@ -803,7 +1017,7 @@ When an override file exists, the `location` block that is normally created by `
 
 You are responsible for providing a suitable `location` block in your override file as required for your service. By default, `nginx-proxy` uses the `VIRTUAL_HOST` name as the upstream name for your application's Docker container; see [here](#unhashed-vs-sha1-upstream-names) for details. As an example, if your container has a `VIRTUAL_HOST` value of `app.example.com`, then to override the location block for `/` you would create a file named `/etc/nginx/vhost.d/app.example.com_location_override` that contains something like this:
 
-```
+```nginx
 location / {
     proxy_pass http://app.example.com;
 }
@@ -826,7 +1040,8 @@ docker run --detach \
     nginxproxy/nginx-proxy
 ```
 
-Note that this will not replace your own services error pages.
+> [!NOTE]
+> This will not replace your own services error pages.
 
 ⬆️ [back to table of contents](#table-of-contents)
 
@@ -881,7 +1096,8 @@ docker run --detach \
     nginxproxy/nginx-proxy
 ```
 
-Please note that TCP and UDP stream are not core features of nginx-proxy, so the above is provided as an example only, without any guarantee.
+> [!NOTE]
+> TCP and UDP stream are not core features of nginx-proxy, so the above is provided as an example only, without any guarantee.
 
 ⬆️ [back to table of contents](#table-of-contents)
 
@@ -889,7 +1105,8 @@ Please note that TCP and UDP stream are not core features of nginx-proxy, so the
 
 By default the nginx configuration `upstream` blocks will use this block's corresponding hostname as a predictable name. However, this can cause issues in some setups (see [this issue](https://github.com/nginx-proxy/nginx-proxy/issues/1162)). In those cases you might want to switch to SHA1 names for the `upstream` blocks by setting the `SHA1_UPSTREAM_NAME` environment variable to `true` on the nginx-proxy container.
 
-Please note that using regular expressions in `VIRTUAL_HOST` will always result in a corresponding `upstream` block with an SHA1 name.
+> [!NOTE]
+> Using regular expressions in `VIRTUAL_HOST` will always result in a corresponding `upstream` block with an SHA1 name.
 
 ⬆️ [back to table of contents](#table-of-contents)
 
@@ -940,8 +1157,6 @@ docker run -e VIRTUAL_HOST=foo.bar.com  ...
 ## Docker Compose
 
 ```yaml
-version: "2"
-
 services:
   nginx-proxy:
     image: nginxproxy/nginx-proxy
@@ -1005,6 +1220,7 @@ The effective `Port` is retrieved by order of precedence:
 ### Debug endpoint
 
 The debug endpoint can be enabled:
+
 - globally by setting the `DEBUG_ENDPOINT` environment variable to `true` on the nginx-proxy container.
 - per container by setting the `com.github.nginx-proxy.nginx-proxy.debug-endpoint` label to `true` on a proxied container.
 
@@ -1106,8 +1322,8 @@ curl -s -H "Host: test.nginx-proxy.tld" localhost/nginx-proxy-debug | jq
 }
 ```
 
-:warning: please be aware that the debug endpoint work by rendering the JSON response straight to the nginx configuration in plaintext. nginx has an upper limit on the size of the configuration files it can parse, so only activate it when needed, and preferably on a per container basis if your setup has a large number of virtual hosts.
-
+> [!WARNING]
+> Please be aware that the debug endpoint work by rendering the JSON response straight to the nginx configuration in plaintext. nginx has an upper limit on the size of the configuration files it can parse, so only activate it when needed, and preferably on a per container basis if your setup has a large number of virtual hosts.
 
 ⬆️ [back to table of contents](#table-of-contents)
 
diff --git a/nginx.tmpl b/nginx.tmpl
index 3d416c3c5..14e30ca54 100644
--- a/nginx.tmpl
+++ b/nginx.tmpl
@@ -19,9 +19,11 @@
 {{- $_ := set $config "external_https_port" ($globals.Env.HTTPS_PORT | default "443") }}
 {{- $_ := set $config "sha1_upstream_name" ($globals.Env.SHA1_UPSTREAM_NAME | default "false" | parseBool) }}
 {{- $_ := set $config "default_root_response" ($globals.Env.DEFAULT_ROOT | default "404") }}
+{{- $_ := set $config "trust_default_cert" ($globals.Env.TRUST_DEFAULT_CERT | default "true") }}
 {{- $_ := set $config "trust_downstream_proxy" ($globals.Env.TRUST_DOWNSTREAM_PROXY | default "true" | parseBool) }}
 {{- $_ := set $config "enable_access_log" ($globals.Env.DISABLE_ACCESS_LOGS | default "false" | parseBool | not) }}
 {{- $_ := set $config "enable_ipv6" ($globals.Env.ENABLE_IPV6 | default "false" | parseBool) }}
+{{- $_ := set $config "prefer_ipv6_network" ($globals.Env.PREFER_IPV6_NETWORK | default "false" | parseBool) }}
 {{- $_ := set $config "ssl_policy" ($globals.Env.SSL_POLICY | default "Mozilla-Intermediate") }}
 {{- $_ := set $config "enable_debug_endpoint" ($globals.Env.DEBUG_ENDPOINT | default "false") }}
 {{- $_ := set $config "hsts" ($globals.Env.HSTS | default "max-age=31536000") }}
@@ -30,6 +32,7 @@
 {{- $_ := set $config "enable_http3" ($globals.Env.ENABLE_HTTP3 | default "false") }}
 {{- $_ := set $config "enable_http_on_missing_cert" ($globals.Env.ENABLE_HTTP_ON_MISSING_CERT | default "true") }}
 {{- $_ := set $config "https_method" ($globals.Env.HTTPS_METHOD | default "redirect") }}
+{{- $_ := set $config "non_get_redirect" ($globals.Env.NON_GET_REDIRECT | default "301") }}
 {{- $_ := set $config "default_host" $globals.Env.DEFAULT_HOST }}
 {{- $_ := set $config "resolvers" $globals.Env.RESOLVERS }}
 {{- /* LOG_JSON is a shorthand that sets logging defaults to JSON format */}}
@@ -75,7 +78,8 @@
      * The return value will be added to the dot dict with key "ip".
      */}}
 {{- define "container_ip" }}
-    {{- $ip := "" }}
+    {{- $ipv4 := "" }}
+    {{- $ipv6 := "" }}
     #     networks:
     {{- range sortObjectsByKeysAsc $.container.Networks "Name" }}
         {{- /*
@@ -90,17 +94,17 @@
             {{- /* Handle containers in host nework mode */}}
             {{- if (index $.globals.networks "host") }}
     #         both container and proxy are in host network mode, using localhost IP
-                {{- $ip = "127.0.0.1" }}
+                {{- $ipv4 = "127.0.0.1" }}
                 {{- continue }}
             {{- end }}
             {{- range sortObjectsByKeysAsc $.globals.CurrentContainer.Networks "Name" }}
                 {{- if and . .Gateway (not .Internal) }}
     #         container is in host network mode, using {{ .Name }} gateway IP
-                    {{- $ip = .Gateway }}
+                    {{- $ipv4 = .Gateway }}
                     {{- break }}
                 {{- end }}
             {{- end }}
-            {{- if $ip }}
+            {{- if $ipv4 }}
                 {{- continue }}
             {{- end }}
         {{- end }}
@@ -110,26 +114,41 @@
         {{- end }}
         {{- /*
              * Do not emit multiple `server` directives for this container if it
-             * is reachable over multiple networks.  This avoids accidentally
-             * inflating the effective round-robin weight of a server due to the
-             * redundant upstream addresses that nginx sees as belonging to
+             * is reachable over multiple networks or multiple IP stacks. This avoids 
+             * accidentally inflating the effective round-robin weight of a server due
+             * to the redundant upstream addresses that nginx sees as belonging to
              * distinct servers.
              */}}
-        {{- if $ip }}
+        {{- if or $ipv4 $ipv6 }}
     #         {{ .Name }} (ignored; reachable but redundant)
             {{- continue }}
         {{- end }}
     #         {{ .Name }} (reachable)
         {{- if and . .IP }}
-            {{- $ip = .IP }}
-        {{- else }}
-    #             /!\ No IP for this network!
+            {{- $ipv4 = .IP }}
+        {{- end }}
+        {{- if and . .GlobalIPv6Address }}
+            {{- $ipv6 = .GlobalIPv6Address }}
+        {{- end }}
+        {{- if and (empty $ipv4) (empty $ipv6) }}
+    #             /!\ No IPv4 or IPv6 for this network!
         {{- end }}
     {{- else }}
     #         (none)
     {{- end }}
-    #     IP address: {{ if $ip }}{{ $ip }}{{ else }}(none usable){{ end }}
-    {{- $_ := set $ "ip" $ip }}
+    {{ if and $ipv6 $.globals.config.prefer_ipv6_network }}
+    #     IPv4 address: {{ if $ipv4 }}{{ $ipv4 }} (ignored; reachable but IPv6 prefered){{ else }}(none usable){{ end }}
+    #     IPv6 address: {{ $ipv6 }}
+        {{- $_ := set $ "ip" (printf "[%s]" $ipv6) }}
+    {{- else }}
+    #     IPv4 address: {{ if $ipv4 }}{{ $ipv4 }}{{ else }}(none usable){{ end }}
+    #     IPv6 address: {{ if $ipv6 }}{{ $ipv6 }}{{ if $ipv4 }} (ignored; reachable but IPv4 prefered){{ end }}{{ else }}(none usable){{ end }}
+        {{- if $ipv4 }}
+            {{- $_ := set $ "ip" $ipv4 }}
+        {{- else if $ipv6}}
+            {{- $_ := set $ "ip" (printf "[%s]" $ipv6) }}
+        {{- end }}
+    {{- end }}
 {{- end }}
 
 {{- /*
@@ -147,7 +166,7 @@
     #     exposed ports (first ten):{{ range $index, $address := (sortObjectsByKeysAsc $.container.Addresses "Port") }}{{ if lt $index 10 }} {{ $address.Port }}/{{ $address.Proto }}{{ end }}{{ else }} (none){{ end }}
     {{- $default_port := when (eq (len $.container.Addresses) 1) (first $.container.Addresses).Port "80" }}
     #     default port: {{ $default_port }}
-    {{- $port := when (eq $.port "default") $default_port (when (eq $.port "legacy") (or $.container.Env.VIRTUAL_PORT $default_port) $.port) }}
+    {{- $port := eq $.port "default" | ternary $default_port $.port }}
     #     using port: {{ $port }}
     {{- $addr_obj := where $.container.Addresses "Port" $port | first }}
     {{- if and $addr_obj $addr_obj.HostPort }}
@@ -367,16 +386,16 @@ upstream {{ $vpath.upstream }} {
 {{- define "debug_location" }}
     {{- $debug_paths := dict }}
     {{- range $path, $vpath := .VHost.paths }}
-        {{- $tmp_port := dict }}
+        {{- $tmp_ports := dict }}
         {{- range $port, $containers := $vpath.ports }}
             {{- $tmp_containers := list }}
             {{- range $container := $containers }}
                 {{- $tmp_containers = dict "Name" $container.Name | append $tmp_containers }}
             {{- end }}
-            {{- $_ := dict $port $tmp_containers | set $tmp_port "ports" }}
-            {{- $tmp_port = deepCopy $vpath | merge $tmp_port }}
+            {{- $_ := set $tmp_ports $port $tmp_containers }}
         {{- end }}
-        {{- $_ := set $debug_paths $path $tmp_port }}
+        {{- $debug_vpath := deepCopy $vpath | merge (dict "ports" $tmp_ports) }}
+        {{- $_ := set $debug_paths $path $debug_vpath }}
     {{- end }}
     
     {{- $debug_vhost := deepCopy .VHost }}
@@ -409,7 +428,7 @@ upstream {{ $vpath.upstream }} {
 
     location  /nginx-proxy-debug {
         default_type application/json;
-        return 200 '{{ toJson $debug_response }}';
+        return 200 '{{ toJson $debug_response }}{{ "\\n" }}';
     }
 {{- end }}
 
@@ -562,7 +581,7 @@ proxy_set_header Proxy "";
     {{- end }}
 
     {{- range $hostname, $vhost := $parsedVhosts }}
-        {{- $vhost_data := when (hasKey $globals.vhosts $hostname) (get $globals.vhosts $hostname) (dict) }}
+        {{- $vhost_data := get $globals.vhosts $hostname | default (dict) }}
         {{- $paths := $vhost_data.paths | default (dict) }}
 
         {{- if (empty $vhost) }}
@@ -571,24 +590,34 @@ proxy_set_header Proxy "";
 
         {{- range $path, $vpath := $vhost }}
             {{- if (empty $vpath) }}
-                {{- $vpath = dict "dest" "" "port" "default" }}
+                {{- $vpath = dict
+                    "dest" ""
+                    "port" "default"
+                    "proto" "http"
+                }}
             {{- end }}
+
             {{- $dest := $vpath.dest | default "" }}
-            {{- $port := when (hasKey $vpath "port") (toString $vpath.port) "default" }}
-            {{- $path_data := when (hasKey $paths $path) (get $paths $path) (dict) }}
-            {{- $path_ports := when (hasKey $path_data "ports") (get $path_data "ports") (dict) }}
-            {{- $path_port_containers := when (hasKey $path_ports $port) (get $path_ports $port) (list) }}
-            {{- $path_port_containers = concat $path_port_containers $containers }}
+            {{- $port := $vpath.port | default "default" | toString }}
+            {{- $proto := $vpath.proto | default "http" }}
+
+            {{- $path_data := get $paths $path | default (dict) }}
+            {{- $path_ports := $path_data.ports | default (dict) }}
+            {{- $path_port_containers := get $path_ports $port | default (list) | concat $containers }}
             {{- $_ := set $path_ports $port $path_port_containers }}
             {{- $_ := set $path_data "ports" $path_ports }}
+            
             {{- if (not (hasKey $path_data "dest")) }}
                 {{- $_ := set $path_data "dest" $dest }}
             {{- end }}
+
+            {{- if (not (hasKey $path_data "proto")) }}
+                {{- $_ := set $path_data "proto" $proto }}
+            {{- end }}
+            
             {{- $_ := set $paths $path $path_data }}
         {{- end }}
         {{- $_ := set $vhost_data "paths" $paths }}
-        {{- $is_regexp := hasPrefix "~" $hostname }}
-        {{- $_ := set $vhost_data "upstream_name" (when (or $is_regexp $globals.config.sha1_upstream_name) (sha1 $hostname) $hostname) }}
         {{- $_ := set $globals.vhosts $hostname $vhost_data }}
     {{- end }}
 {{- end }}
@@ -613,34 +642,42 @@ proxy_set_header Proxy "";
         {{- continue }}
     {{- end }}
 
-    {{- $vhost_data := when (hasKey $globals.vhosts $hostname) (get $globals.vhosts $hostname) (dict) }}
+    {{- $vhost_data := get $globals.vhosts $hostname | default (dict) }}
     {{- $paths := $vhost_data.paths | default (dict) }}
 
     {{- $tmp_paths := groupByWithDefault $containers "Env.VIRTUAL_PATH" "/" }}
 
     {{- range $path, $containers := $tmp_paths }}
         {{- $dest := groupByKeys $containers "Env.VIRTUAL_DEST" | first | default "" }}
-        {{- $port := "legacy" }}
-        {{- $path_data := when (hasKey $paths $path) (get $paths $path) (dict) }}
-        {{- $path_ports := when (hasKey $path_data "ports") (get $path_data "ports") (dict) }}
-        {{- $path_port_containers := when (hasKey $path_ports $port) (get $path_ports $port) (list) }}
-        {{- $path_port_containers = concat $path_port_containers $containers }}
-        {{- $_ := set $path_ports $port $path_port_containers }}
+        {{- $proto := groupByKeys $containers "Env.VIRTUAL_PROTO" | first | default "http" | trim }}
+
+        {{- $path_data := get $paths $path | default (dict) }}
+        {{- $path_ports := $path_data.ports | default (dict) }}
+        {{- range $port, $containers := groupByWithDefault $containers "Env.VIRTUAL_PORT" "default" }}
+            {{- $path_port_containers := get $path_ports $port | default (list) | concat $containers }}
+            {{- $_ := set $path_ports $port $path_port_containers }}
+        {{- end }}
         {{- $_ := set $path_data "ports" $path_ports }}
+
         {{- if (not (hasKey $path_data "dest")) }}
             {{- $_ := set $path_data "dest" $dest }}
         {{- end }}
+
+        {{- if (not (hasKey $path_data "proto")) }}
+            {{- $_ := set $path_data "proto" $proto }}
+        {{- end }}
+        
         {{- $_ := set $paths $path $path_data }}
     {{- end }}
     {{- $_ := set $vhost_data "paths" $paths }}
-    {{- $is_regexp := hasPrefix "~" $hostname }}
-    {{- $_ := set $vhost_data "upstream_name" (when (or $is_regexp $globals.config.sha1_upstream_name) (sha1 $hostname) $hostname) }}
     {{- $_ := set $globals.vhosts $hostname $vhost_data }}
 {{- end }}
 
 {{- /* Loop over $globals.vhosts and update it with the remaining informations about each vhost. */}}
 {{- range $hostname, $vhost_data := $globals.vhosts }}
     {{- $is_regexp := hasPrefix "~" $hostname }}
+    {{- $upstream_name := or $is_regexp $globals.config.sha1_upstream_name | ternary (sha1 $hostname) $hostname }}
+
     {{- $vhost_containers := list }}
 
     {{- range $path, $vpath_data := $vhost_data.paths }}
@@ -649,21 +686,18 @@ proxy_set_header Proxy "";
             {{ $vpath_containers = concat $vpath_containers $vport_containers }}
         {{- end }}
 
-        {{- /* Get the VIRTUAL_PROTO defined by containers w/ the same vhost-vpath, falling back to "http". */}}
-        {{- $proto := groupByKeys $vpath_containers "Env.VIRTUAL_PROTO" | first | default "http" | trim }}
         {{- /* Get the NETWORK_ACCESS defined by containers w/ the same vhost, falling back to "external". */}}
         {{- $network_tag := groupByKeys $vpath_containers "Env.NETWORK_ACCESS" | first | default "external" }}
 
         {{- $loadbalance := groupByLabel $vpath_containers "com.github.nginx-proxy.nginx-proxy.loadbalance" | keys | first }}
-        {{- $keepalive := groupByLabel $vpath_containers "com.github.nginx-proxy.nginx-proxy.keepalive" | keys | first | default "disabled" }}
+        {{- $keepalive := groupByLabel $vpath_containers "com.github.nginx-proxy.nginx-proxy.keepalive" | keys | first | default "auto" }}
 
-        {{- $upstream := $vhost_data.upstream_name }}
+        {{- $upstream := $upstream_name }}
         {{- if (not (eq $path "/")) }}
             {{- $sum := sha1 $path }}
             {{- $upstream = printf "%s-%s" $upstream $sum }}
         {{- end }}
 
-        {{- $_ := set $vpath_data "proto" $proto }}
         {{- $_ := set $vpath_data "network_tag" $network_tag }}
         {{- $_ := set $vpath_data "upstream" $upstream }}
         {{- $_ := set $vpath_data "loadbalance" $loadbalance }}
@@ -673,23 +707,41 @@ proxy_set_header Proxy "";
         {{ $vhost_containers = concat $vhost_containers $vpath_containers }}
     {{- end }}
 
-    {{- $certName := groupByKeys $vhost_containers "Env.CERT_NAME" | first }}
-    {{- $vhostCert := closest (dir "/etc/nginx/certs") (printf "%s.crt" $hostname) }}
-    {{- $vhostCert = trimSuffix ".crt" $vhostCert }}
-    {{- $vhostCert = trimSuffix ".key" $vhostCert }}
-    {{- $cert := or $certName $vhostCert }}
+    {{- $userIdentifiedCert := groupByKeys $vhost_containers "Env.CERT_NAME" | first }}
+    
+    {{- $vhostCert := "" }}
+    {{- if exists (printf "/etc/nginx/certs/%s.crt" $hostname) }}
+        {{- $vhostCert = $hostname }}
+    {{- end }}
+
+    {{- $parentVhostCert := "" }}
+    {{- if gt ($hostname | sprigSplit "." | len) 2 }}
+        {{- $parentHostname := ($hostname | sprigSplitn "." 2)._1 }}
+        {{- if exists (printf "/etc/nginx/certs/%s.crt" $parentHostname) }}
+            {{- $parentVhostCert = $parentHostname }}
+        {{- end }}
+    {{- end }}
+    
+    {{- $trust_default_cert := groupByLabel $vhost_containers "com.github.nginx-proxy.nginx-proxy.trust-default-cert" | keys | first | default $globals.config.trust_default_cert | parseBool }}
+    {{- $defaultCert := and $trust_default_cert $globals.config.default_cert_ok | ternary "default" "" }}
+    
+    {{- $cert := or $userIdentifiedCert $vhostCert $parentVhostCert $defaultCert }}
     {{- $cert_ok := and (ne $cert "") (exists (printf "/etc/nginx/certs/%s.crt" $cert)) (exists (printf "/etc/nginx/certs/%s.key" $cert)) }}
 
     {{- $enable_debug_endpoint := groupByLabel $vhost_containers "com.github.nginx-proxy.nginx-proxy.debug-endpoint" | keys | first | default $globals.config.enable_debug_endpoint | parseBool }}
     {{- $default := eq $globals.config.default_host $hostname }}
     {{- $https_method := groupByKeys $vhost_containers "Env.HTTPS_METHOD" | first | default $globals.config.https_method }}
     {{- $enable_http_on_missing_cert := groupByKeys $vhost_containers "Env.ENABLE_HTTP_ON_MISSING_CERT" | first | default $globals.config.enable_http_on_missing_cert | parseBool }}
-    {{- /* When the certificate is missing we want to ensure that HTTP is enabled; hence switching from 'nohttp' or 'redirect' to 'noredirect' */}}
-    {{- if (and $enable_http_on_missing_cert (not $cert_ok) (or (eq $https_method "nohttp") (eq $https_method "redirect"))) }}
+    {{- /* When no trusted certs (default and/or vhost) are present we want to ensure that HTTP is enabled; hence switching from 'nohttp' or 'redirect' to 'noredirect' */}}
+    {{- $https_method_disable_http := list "nohttp" "redirect" | has $https_method }}
+    {{- if and $https_method_disable_http (not $cert_ok) $enable_http_on_missing_cert }}
         {{- $https_method = "noredirect" }}
     {{- end }}
+    {{- $non_get_redirect := groupByLabel $vhost_containers "com.github.nginx-proxy.nginx-proxy.non-get-redirect" | keys | first | default $globals.config.non_get_redirect }}
+    
     {{- $http2_enabled := groupByLabel $vhost_containers "com.github.nginx-proxy.nginx-proxy.http2.enable" | keys | first | default $globals.config.enable_http2 | parseBool }}
     {{- $http3_enabled := groupByLabel $vhost_containers "com.github.nginx-proxy.nginx-proxy.http3.enable" | keys | first | default $globals.config.enable_http3 | parseBool }}
+    
     {{- $acme_http_challenge := groupByKeys $vhost_containers "Env.ACME_HTTP_CHALLENGE_LOCATION" | first | default $globals.config.acme_http_challenge }}
     {{- $acme_http_challenge_legacy := eq $acme_http_challenge "legacy" }}
     {{- $acme_http_challenge_enabled := false }}
@@ -716,6 +768,7 @@ proxy_set_header Proxy "";
         "default" $default
         "hsts" $hsts
         "https_method" $https_method
+        "non_get_redirect" $non_get_redirect
         "http2_enabled" $http2_enabled
         "http3_enabled" $http3_enabled
         "is_regexp" $is_regexp
@@ -723,6 +776,8 @@ proxy_set_header Proxy "";
         "acme_http_challenge_enabled" $acme_http_challenge_enabled
         "server_tokens" $server_tokens
         "ssl_policy" $ssl_policy
+        "trust_default_cert" $trust_default_cert
+        "upstream_name" $upstream_name
         "vhost_root" $vhost_root
     ) }}
     {{- $_ := set $globals.vhosts $hostname $vhost_data }}
@@ -854,11 +909,14 @@ server {
         {{- end }}
 
     location / {
-        {{- if eq $globals.config.external_https_port "443" }}
-        return 301 https://$host$request_uri;
-        {{- else }}
-        return 301 https://$host:{{ $globals.config.external_https_port }}$request_uri;
-        {{- end }}
+        {{- $redirect_uri := "https://$host$request_uri" }}
+        {{- if ne $globals.config.external_https_port "443" }}
+            {{- $redirect_uri = printf "https://$host:%s$request_uri" $globals.config.external_https_port }}
+        {{- end}}
+        if ($request_method ~ (OPTIONS|POST|PUT|PATCH|DELETE)) {
+            return {{ $vhost.non_get_redirect }} {{ $redirect_uri }};
+        }
+        return 301 {{ $redirect_uri }};
     }
 }
     {{- end }}
@@ -947,14 +1005,9 @@ server {
     }
     add_header Strict-Transport-Security $sts_header always;
             {{- end }}
-        {{- else if $globals.config.default_cert_ok }}
-    # No certificate found for this vhost, so use the default certificate and
-    # return an error code if the user connects via https.
-    ssl_certificate /etc/nginx/certs/default.crt;
-    ssl_certificate_key /etc/nginx/certs/default.key;
-    if ($https) {
-        return 500;
-    }
+        {{- else if not $vhost.trust_default_cert | and $globals.config.default_cert_ok }}
+    # No certificate found for this vhost, and the default certificate isn't trusted, so reject SSL handshake.
+    ssl_reject_handshake on;
         {{- else }}
     # No certificate for this vhost nor default certificate found, so reject SSL handshake.
     ssl_reject_handshake on;
diff --git a/test/README.md b/test/README.md
index 07a29d28b..29723f127 100644
--- a/test/README.md
+++ b/test/README.md
@@ -57,13 +57,39 @@ This test suite uses [pytest](http://doc.pytest.org/en/latest/). The [conftest.p
 
 ### docker_compose fixture
 
-When using the `docker_compose` fixture in a test, pytest will try to find a yml file named after your test module filename. For instance, if your test module is `test_example.py`, then the `docker_compose` fixture will try to load a `test_example.yml` [docker compose file](https://docs.docker.com/compose/compose-file/).
+When using the `docker_compose` fixture in a test, pytest will try to start the [Docker Compose](https://docs.docker.com/compose/) services corresponding to the current test module, based on the test module filename.
 
-Once the docker compose file found, the fixture will remove all containers, run `docker compose up`, and finally your test will be executed.
+By default, if your test module file is `test/test_subdir/test_example.py`, then the `docker_compose` fixture will try to load the following files, [merging them](https://docs.docker.com/reference/compose-file/merge/) in this order:
 
-The fixture will run the _docker compose_ command with the `-f` option to load the given compose file. So you can test your docker compose file syntax by running it yourself with:
+1. `test/compose.base.yml`
+2. `test/test_subdir/compose.base.override.yml` (if it exists)
+3. `test/test_subdir/test_example.yml`
 
-    docker compose -f test_example.yml up -d
+The fixture will run the _docker compose_ command with the `-f` option to load the given compose files. So you can test your docker compose file syntax by running it yourself with:
+
+    docker compose -f test/compose.base.yml -f test/test_subdir/test_example.yml up -d
+
+The first file contains the base configuration of the nginx-proxy container common to most tests:
+
+```yaml
+services:
+  nginx-proxy:
+    image: nginxproxy/nginx-proxy:test
+    container_name: nginx-proxy
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    ports:
+      - "80:80"
+      - "443:443"
+```
+
+The second optional file allow you to override this base configuration for all test modules in a subfolder.
+
+The third file contains the services and overrides specific to a given test module.
+
+This automatic merge can be bypassed by using a file named `test_example.base.yml` (instead of `test_example.yml`). When this file exist, it will be the only one used by the test and no merge with other compose files will automatically occur.
+
+The `docker_compose` fixture also set the `PYTEST_MODULE_PATH` environment variable to the absolute path of the current test module directory, so it can be used to mount files or directory relatives to the current test.
 
 In the case you are running pytest from within a docker container, the `docker_compose` fixture will make sure the container running pytest is attached to all docker networks. That way, your test will be able to reach any of them.
 
@@ -71,7 +97,10 @@ In your tests, you can use the `docker_compose` variable to query and command th
 
 Also this fixture alters the way the python interpreter resolves domain names to IP addresses in the following ways:
 
-Any domain name containing the substring `nginx-proxy` will resolve to the IP address of the container that was created from the `nginxproxy/nginx-proxy:test` image. So all the following domain names will resolve to the nginx-proxy container in tests:
+Any domain name containing the substring `nginx-proxy` will resolve to `127.0.0.1` if the tests are executed on a Darwin (macOS) system, otherwise the IP address of the container that was created from the `nginxproxy/nginx-proxy:test` image.
+
+So, in tests, all the following domain names will resolve to either localhost or the nginx-proxy container's IP:
+
 - `nginx-proxy`
 - `nginx-proxy.com`
 - `www.nginx-proxy.com`
@@ -80,14 +109,16 @@ Any domain name containing the substring `nginx-proxy` will resolve to the IP ad
 - `whatever.nginx-proxyooooooo`
 - ...
 
-Any domain name ending with `XXX.container.docker` will resolve to the IP address of the XXX container.
+Any domain name ending with `XXX.container.docker` will resolve to `127.0.0.1` if the tests are executed on a Darwin (macOS) system, otherwise the IP address of the container named `XXX`.
+
+So, on a non-Darwin system:
+
 - `web1.container.docker` will resolve to the IP address of the `web1` container
 - `f00.web1.container.docker` will resolve to the IP address of the `web1` container
 - `anything.whatever.web2.container.docker` will resolve to the IP address of the `web2` container
 
 Otherwise, domain names are resoved as usual using your system DNS resolver.
 
-
 ### nginxproxy fixture
 
 The `nginxproxy` fixture will provide you with a replacement for the python [requests](https://pypi.python.org/pypi/requests/) module. This replacement will just repeat up to 30 times a requests if it receives the HTTP error 404 or 502. This error occurs when you try to send queries to nginx-proxy too early after the container creation.
diff --git a/test/certs/create_server_certificate.sh b/test/certs/create_server_certificate.sh
index 01413ee34..07d1d5100 100755
--- a/test/certs/create_server_certificate.sh
+++ b/test/certs/create_server_certificate.sh
@@ -24,7 +24,7 @@ fi
 # Create a nginx container (which conveniently provides the `openssl` command)
 ###############################################################################
 
-CONTAINER=$(docker run -d -v $DIR:/work -w /work -e SAN="$ALTERNATE_DOMAINS" nginx:1.27.2)
+CONTAINER=$(docker run -d -v $DIR:/work -w /work -e SAN="$ALTERNATE_DOMAINS" nginx:1.27.3)
 # Configure openssl
 docker exec $CONTAINER bash -c '
 	mkdir -p /ca/{certs,crl,private,newcerts} 2>/dev/null
diff --git a/test/test_events.yml b/test/compose.base.yml
similarity index 54%
rename from test/test_events.yml
rename to test/compose.base.yml
index ac27e1d0c..36e804bc0 100644
--- a/test/test_events.yml
+++ b/test/compose.base.yml
@@ -1,7 +1,9 @@
-version: "2"
-
 services:
-  nginxproxy:
+  nginx-proxy:
     image: nginxproxy/nginx-proxy:test
+    container_name: nginx-proxy
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
+    ports:
+      - "80:80"
+      - "443:443"
diff --git a/test/conftest.py b/test/conftest.py
index dda20f60b..56cda49c8 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -1,28 +1,35 @@
 import contextlib
 import logging
 import os
+import pathlib
+import platform
 import re
 import shlex
 import socket
 import subprocess
 import time
-from typing import List
+from io import StringIO
+from typing import Iterator, List, Optional
 
 import backoff
-import docker
+import docker.errors
 import pytest
 import requests
-from _pytest._code.code import ReprExceptionInfo
-from distutils.version import LooseVersion
+from _pytest.fixtures import FixtureRequest
+from docker import DockerClient
 from docker.models.containers import Container
-from requests.packages.urllib3.util.connection import HAS_IPV6
+from docker.models.networks import Network
+from packaging.version import Version
+from requests import Response
+from urllib3.util.connection import HAS_IPV6
+
 
 logging.basicConfig(level=logging.INFO)
 logging.getLogger('backoff').setLevel(logging.INFO)
 logging.getLogger('DNS').setLevel(logging.DEBUG)
 logging.getLogger('requests.packages.urllib3.connectionpool').setLevel(logging.WARN)
 
-CA_ROOT_CERTIFICATE = os.path.join(os.path.dirname(__file__), 'certs/ca-root.crt')
+CA_ROOT_CERTIFICATE = pathlib.Path(__file__).parent.joinpath("certs/ca-root.crt")
 PYTEST_RUNNING_IN_CONTAINER = os.environ.get('PYTEST_RUNNING_IN_CONTAINER') == "1"
 FORCE_CONTAINER_IPV6 = False  # ugly global state to consider containers' IPv6 address instead of IPv4
 
@@ -40,8 +47,9 @@
 #
 ###############################################################################
 
+
 @contextlib.contextmanager
-def ipv6(force_ipv6=True):
+def ipv6(force_ipv6: bool = True):
     """
     Meant to be used as a context manager to force IPv6 sockets:
 
@@ -59,19 +67,19 @@ def ipv6(force_ipv6=True):
     FORCE_CONTAINER_IPV6 = False
 
 
-class requests_for_docker(object):
+class RequestsForDocker:
     """
     Proxy for calling methods of the requests module.
-    When a HTTP response failed due to HTTP Error 404 or 502, retry a few times.
+    When an HTTP response failed due to HTTP Error 404 or 502, retry a few times.
     Provides method `get_conf` to extract the nginx-proxy configuration content.
     """
     def __init__(self):
         self.session = requests.Session()
-        if os.path.isfile(CA_ROOT_CERTIFICATE):
-            self.session.verify = CA_ROOT_CERTIFICATE
+        if CA_ROOT_CERTIFICATE.is_file():
+            self.session.verify = CA_ROOT_CERTIFICATE.as_posix()
 
     @staticmethod
-    def get_nginx_proxy_containers() -> List[Container]:
+    def get_nginx_proxy_container() -> Container:
         """
         Return list of containers
         """
@@ -80,69 +88,69 @@ def get_nginx_proxy_containers() -> List[Container]:
             pytest.fail("Too many running nginxproxy/nginx-proxy:test containers", pytrace=False)
         elif len(nginx_proxy_containers) == 0:
             pytest.fail("No running nginxproxy/nginx-proxy:test container", pytrace=False)
-        return nginx_proxy_containers
+        return nginx_proxy_containers.pop()
 
-    def get_conf(self):
+    def get_conf(self) -> bytes:
         """
         Return the nginx config file
         """
-        nginx_proxy_containers = self.get_nginx_proxy_containers()
-        return get_nginx_conf_from_container(nginx_proxy_containers[0])
+        nginx_proxy_container = self.get_nginx_proxy_container()
+        return get_nginx_conf_from_container(nginx_proxy_container)
 
     def get_ip(self) -> str:
         """
         Return the nginx container ip address
         """
-        nginx_proxy_containers = self.get_nginx_proxy_containers()
-        return container_ip(nginx_proxy_containers[0])
+        nginx_proxy_container = self.get_nginx_proxy_container()
+        return container_ip(nginx_proxy_container)
 
-    def get(self, *args, **kwargs):
+    def get(self, *args, **kwargs) -> Response:
         with ipv6(kwargs.pop('ipv6', False)):
             @backoff.on_predicate(backoff.constant, lambda r: r.status_code in (404, 502), interval=.3, max_tries=30, jitter=None)
-            def _get(*args, **kwargs):
-                return self.session.get(*args, **kwargs)
+            def _get(*_args, **_kwargs):
+                return self.session.get(*_args, **_kwargs)
             return _get(*args, **kwargs)
 
-    def post(self, *args, **kwargs):
+    def post(self, *args, **kwargs) -> Response:
         with ipv6(kwargs.pop('ipv6', False)):
             @backoff.on_predicate(backoff.constant, lambda r: r.status_code in (404, 502), interval=.3, max_tries=30, jitter=None)
-            def _post(*args, **kwargs):
-                return self.session.post(*args, **kwargs)
+            def _post(*_args, **_kwargs):
+                return self.session.post(*_args, **_kwargs)
             return _post(*args, **kwargs)
 
-    def put(self, *args, **kwargs):
+    def put(self, *args, **kwargs) -> Response:
         with ipv6(kwargs.pop('ipv6', False)):
             @backoff.on_predicate(backoff.constant, lambda r: r.status_code in (404, 502), interval=.3, max_tries=30, jitter=None)
-            def _put(*args, **kwargs):
-                return self.session.put(*args, **kwargs)
+            def _put(*_args, **_kwargs):
+                return self.session.put(*_args, **_kwargs)
             return _put(*args, **kwargs)
 
-    def head(self, *args, **kwargs):
+    def head(self, *args, **kwargs) -> Response:
         with ipv6(kwargs.pop('ipv6', False)):
             @backoff.on_predicate(backoff.constant, lambda r: r.status_code in (404, 502), interval=.3, max_tries=30, jitter=None)
-            def _head(*args, **kwargs):
-                return self.session.head(*args, **kwargs)
+            def _head(*_args, **_kwargs):
+                return self.session.head(*_args, **_kwargs)
             return _head(*args, **kwargs)
 
-    def delete(self, *args, **kwargs):
+    def delete(self, *args, **kwargs) -> Response:
         with ipv6(kwargs.pop('ipv6', False)):
             @backoff.on_predicate(backoff.constant, lambda r: r.status_code in (404, 502), interval=.3, max_tries=30, jitter=None)
-            def _delete(*args, **kwargs):
-                return self.session.delete(*args, **kwargs)
+            def _delete(*_args, **_kwargs):
+                return self.session.delete(*_args, **_kwargs)
             return _delete(*args, **kwargs)
 
-    def options(self, *args, **kwargs):
+    def options(self, *args, **kwargs) -> Response:
         with ipv6(kwargs.pop('ipv6', False)):
             @backoff.on_predicate(backoff.constant, lambda r: r.status_code in (404, 502), interval=.3, max_tries=30, jitter=None)
-            def _options(*args, **kwargs):
-                return self.session.options(*args, **kwargs)
+            def _options(*_args, **_kwargs):
+                return self.session.options(*_args, **_kwargs)
             return _options(*args, **kwargs)
 
     def __getattr__(self, name):
         return getattr(requests, name)
 
 
-def container_ip(container: Container):
+def container_ip(container: Container) -> str:
     """
     return the IP address of a container.
 
@@ -171,7 +179,7 @@ def container_ip(container: Container):
         return net_info[network_name]["IPAddress"]
 
 
-def container_ipv6(container):
+def container_ipv6(container: Container) -> str:
     """
     return the IPv6 address of a container.
     """
@@ -188,7 +196,7 @@ def container_ipv6(container):
     return net_info[network_name]["GlobalIPv6Address"]
 
 
-def nginx_proxy_dns_resolver(domain_name):
+def nginx_proxy_dns_resolver(domain_name: str) -> Optional[str]:
     """
     if "nginx-proxy" if found in host, return the ip address of the docker container
     issued from the docker image nginxproxy/nginx-proxy:test.
@@ -200,21 +208,21 @@ def nginx_proxy_dns_resolver(domain_name):
     if 'nginx-proxy' in domain_name:
         nginxproxy_containers = docker_client.containers.list(filters={"status": "running", "ancestor": "nginxproxy/nginx-proxy:test"})
         if len(nginxproxy_containers) == 0:
-            log.warn(f"no container found from image nginxproxy/nginx-proxy:test while resolving {domain_name!r}")
+            log.warning(f"no container found from image nginxproxy/nginx-proxy:test while resolving {domain_name!r}")
             exited_nginxproxy_containers = docker_client.containers.list(filters={"status": "exited", "ancestor": "nginxproxy/nginx-proxy:test"})
             if len(exited_nginxproxy_containers) > 0:
                 exited_nginxproxy_container_logs = exited_nginxproxy_containers[0].logs()
-                log.warn(f"nginxproxy/nginx-proxy:test container might have exited unexpectedly. Container logs: " + "\n" + exited_nginxproxy_container_logs.decode())
-            return
+                log.warning(f"nginxproxy/nginx-proxy:test container might have exited unexpectedly. Container logs: " + "\n" + exited_nginxproxy_container_logs.decode())
+            return None
         nginxproxy_container = nginxproxy_containers[0]
         ip = container_ip(nginxproxy_container)
         log.info(f"resolving domain name {domain_name!r} as IP address {ip} of nginx-proxy container {nginxproxy_container.name}")
         return ip
 
-def docker_container_dns_resolver(domain_name):
+def docker_container_dns_resolver(domain_name: str) -> Optional[str]:
     """
-    if domain name is of the form "XXX.container.docker" or "anything.XXX.container.docker", return the ip address of the docker container
-    named XXX.
+    if domain name is of the form "XXX.container.docker" or "anything.XXX.container.docker",
+    return the ip address of the docker container named XXX.
 
     :return: IP or None
     """
@@ -224,15 +232,15 @@ def docker_container_dns_resolver(domain_name):
     match = re.search(r'(^|.+\.)(?P<container>[^.]+)\.container\.docker$', domain_name)
     if not match:
         log.debug(f"{domain_name!r} does not match")
-        return
+        return None
 
     container_name = match.group('container')
     log.debug(f"looking for container {container_name!r}")
     try:
         container = docker_client.containers.get(container_name)
     except docker.errors.NotFound:
-        log.warn(f"container named {container_name!r} not found while resolving {domain_name!r}")
-        return
+        log.warning(f"container named {container_name!r} not found while resolving {domain_name!r}")
+        return None
     log.debug(f"container {container.name!r} found ({container.short_id})")
 
     ip = container_ip(container)
@@ -244,7 +252,10 @@ def monkey_patch_urllib_dns_resolver():
     """
     Alter the behavior of the urllib DNS resolver so that any domain name
     containing substring 'nginx-proxy' will resolve to the IP address
-    of the container created from image 'nginxproxy/nginx-proxy:test'.
+    of the container created from image 'nginxproxy/nginx-proxy:test',
+    or to 127.0.0.1 on Darwin.
+
+    see https://docs.docker.com/desktop/features/networking/#i-want-to-connect-to-a-container-from-the-host
     """
     prv_getaddrinfo = socket.getaddrinfo
     dns_cache = {}
@@ -252,13 +263,18 @@ def new_getaddrinfo(*args):
         logging.getLogger('DNS').debug(f"resolving domain name {repr(args)}")
         _args = list(args)
 
-        # Fail early when querying IP directly and it is forced ipv6 when not supported,
+        # Fail early when querying IP directly, and it is forced ipv6 when not supported,
         # Otherwise a pytest container not using the host network fails to pass `test_raw-ip-vhost`.
         if FORCE_CONTAINER_IPV6 and not HAS_IPV6:
             pytest.skip("This system does not support IPv6")
 
         # custom DNS resolvers
-        ip = nginx_proxy_dns_resolver(args[0])
+        ip = None
+        # Docker Desktop can't route traffic directly to Linux containers.
+        if platform.system() == "Darwin":
+            ip = "127.0.0.1"
+        if ip is None:
+            ip = nginx_proxy_dns_resolver(args[0])
         if ip is None:
             ip = docker_container_dns_resolver(args[0])
         if ip is not None:
@@ -274,19 +290,12 @@ def new_getaddrinfo(*args):
     socket.getaddrinfo = new_getaddrinfo
     return prv_getaddrinfo
 
+
 def restore_urllib_dns_resolver(getaddrinfo_func):
     socket.getaddrinfo = getaddrinfo_func
 
 
-def remove_all_containers():
-    for container in docker_client.containers.list(all=True):
-        if PYTEST_RUNNING_IN_CONTAINER and container.name == test_container:
-            continue  # pytest is running within a Docker container, so we do not want to remove that particular container
-        logging.info(f"removing container {container.name}")
-        container.remove(v=True, force=True)
-
-
-def get_nginx_conf_from_container(container):
+def get_nginx_conf_from_container(container: Container) -> bytes:
     """
     return the nginx /etc/nginx/conf.d/default.conf file content from a container
     """
@@ -301,20 +310,40 @@ def get_nginx_conf_from_container(container):
         return conffile.read()
 
 
-def docker_compose_up(compose_file='docker-compose.yml'):
-    logging.info(f'{DOCKER_COMPOSE} -f {compose_file} up -d')
+def __prepare_and_execute_compose_cmd(compose_files: List[str], project_name: str, cmd: str):
+    """
+    Prepare and execute the Docker Compose command with the provided compose files and project name.
+    """
+    compose_cmd = StringIO()
+    compose_cmd.write(DOCKER_COMPOSE)
+    compose_cmd.write(f" --project-name {project_name}")
+    for compose_file in compose_files:
+        compose_cmd.write(f" --file {compose_file}")
+    compose_cmd.write(f" {cmd}")
+
+    logging.info(compose_cmd.getvalue())
     try:
-        subprocess.check_output(shlex.split(f'{DOCKER_COMPOSE} -f {compose_file} up -d'), stderr=subprocess.STDOUT)
+        subprocess.check_output(shlex.split(compose_cmd.getvalue()), stderr=subprocess.STDOUT)
     except subprocess.CalledProcessError as e:
-        pytest.fail(f"Error while runninng '{DOCKER_COMPOSE} -f {compose_file} up -d':\n{e.output}", pytrace=False)
+        pytest.fail(f"Error while running '{compose_cmd.getvalue()}':\n{e.output}", pytrace=False)
 
 
-def docker_compose_down(compose_file='docker-compose.yml'):
-    logging.info(f'{DOCKER_COMPOSE} -f {compose_file} down -v')
-    try:
-        subprocess.check_output(shlex.split(f'{DOCKER_COMPOSE} -f {compose_file} down -v'), stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        pytest.fail(f"Error while runninng '{DOCKER_COMPOSE} -f {compose_file} down -v':\n{e.output}", pytrace=False)
+def docker_compose_up(compose_files: List[str], project_name: str):
+    """
+    Execute compose up --detach with the provided compose files and project name.
+    """
+    if compose_files is None or len(compose_files) == 0:
+        pytest.fail(f"No compose file passed to docker_compose_up", pytrace=False)
+    __prepare_and_execute_compose_cmd(compose_files, project_name, cmd="up --detach")
+
+
+def docker_compose_down(compose_files: List[str], project_name: str):
+    """
+    Execute compose down --volumes with the provided compose files and project name.
+    """
+    if compose_files is None or len(compose_files) == 0:
+        pytest.fail(f"No compose file passed to docker_compose_up", pytrace=False)
+    __prepare_and_execute_compose_cmd(compose_files, project_name, cmd="down --volumes")
 
 
 def wait_for_nginxproxy_to_be_ready():
@@ -333,35 +362,50 @@ def wait_for_nginxproxy_to_be_ready():
 
 
 @pytest.fixture
-def docker_compose_file(request):
-    """Fixture naming the docker compose file to consider.
+def docker_compose_files(request: FixtureRequest) -> List[str]:
+    """Fixture returning the docker compose files to consider:
+
+    If a YAML file exists with the same name as the test module (with the `.py` extension
+    replaced with `.base.yml`, ie `test_foo.py`-> `test_foo.base.yml`) and in the same
+    directory as the test module, use only that file.
+
+    Otherwise, merge the following files in this order:
 
-    If a YAML file exists with the same name as the test module (with the `.py` extension replaced
-    with `.yml` or `.yaml`), use that.  Otherwise, use `docker-compose.yml` in the same directory
-    as the test module.
+    - the `compose.base.yml` file in the parent `test` directory.
+    - if present in the same directory as the test module, the `compose.base.override.yml` file.
+    - the YAML file named after the current test module (ie `test_foo.py`-> `test_foo.yml`)
 
     Tests can override this fixture to specify a custom location.
     """
-    test_module_dir = os.path.dirname(request.module.__file__)
-    yml_file = os.path.join(test_module_dir, request.module.__name__ + '.yml')
-    yaml_file = os.path.join(test_module_dir, request.module.__name__ + '.yaml')
-    default_file = os.path.join(test_module_dir, 'docker-compose.yml')
+    compose_files: List[str] = []
+    test_module_path = pathlib.Path(request.module.__file__).parent
 
-    if os.path.isfile(yml_file):
-        docker_compose_file = yml_file
-    elif os.path.isfile(yaml_file):
-        docker_compose_file = yaml_file
-    else:
-        docker_compose_file = default_file
+    module_base_file = test_module_path.joinpath(f"{request.module.__name__}.base.yml")
+    if module_base_file.is_file():
+        return [module_base_file.as_posix()]
+
+    global_base_file = test_module_path.parent.joinpath("compose.base.yml")
+    if global_base_file.is_file():
+        compose_files.append(global_base_file.as_posix())
+
+    module_base_override_file = test_module_path.joinpath("compose.base.override.yml")
+    if module_base_override_file.is_file():
+        compose_files.append(module_base_override_file.as_posix())
+
+    module_compose_file = test_module_path.joinpath(f"{request.module.__name__}.yml")
+    if module_compose_file.is_file():
+        compose_files.append(module_compose_file.as_posix())
 
-    if not os.path.isfile(docker_compose_file):
-        logging.error("Could not find any docker compose file named either '{0}.yml', '{0}.yaml' or 'docker-compose.yml'".format(request.module.__name__))
+    if not module_base_file.is_file() and not module_compose_file.is_file():
+        logging.error(
+            f"Could not find any docker compose file named '{module_base_file.name}' or '{module_compose_file.name}'"
+        )
 
-    logging.debug(f"using docker compose file {docker_compose_file}")
-    return docker_compose_file
+    logging.debug(f"using docker compose files {compose_files}")
+    return compose_files
 
 
-def connect_to_network(network):
+def connect_to_network(network: Network) -> Optional[Network]:
     """
     If we are running from a container, connect our container to the given network
 
@@ -371,8 +415,8 @@ def connect_to_network(network):
         try:
             my_container = docker_client.containers.get(test_container)
         except docker.errors.NotFound:
-            logging.warn(f"container {test_container} not found")
-            return
+            logging.warning(f"container {test_container} not found")
+            return None
 
         # figure out our container networks
         my_networks = list(my_container.attrs["NetworkSettings"]["Networks"].keys())
@@ -389,7 +433,7 @@ def connect_to_network(network):
             return network
 
 
-def disconnect_from_network(network=None):
+def disconnect_from_network(network: Network = None):
     """
     If we are running from a container, disconnect our container from the given network.
 
@@ -399,7 +443,7 @@ def disconnect_from_network(network=None):
         try:
             my_container = docker_client.containers.get(test_container)
         except docker.errors.NotFound:
-            logging.warn(f"container {test_container} not found")
+            logging.warning(f"container {test_container} not found")
             return
 
         # figure out our container networks
@@ -411,7 +455,7 @@ def disconnect_from_network(network=None):
             network.disconnect(my_container)
 
 
-def connect_to_all_networks():
+def connect_to_all_networks() -> List[Network]:
     """
     If we are running from a container, connect our container to all current docker networks.
 
@@ -427,31 +471,34 @@ def connect_to_all_networks():
 
 class DockerComposer(contextlib.AbstractContextManager):
     def __init__(self):
-        self._docker_compose_file = None
+        self._networks = None
+        self._docker_compose_files = None
+        self._project_name = None
 
     def __exit__(self, *exc_info):
         self._down()
 
     def _down(self):
-        if self._docker_compose_file is None:
+        if self._docker_compose_files is None:
             return
         for network in self._networks:
             disconnect_from_network(network)
-        docker_compose_down(self._docker_compose_file)
+        docker_compose_down(self._docker_compose_files, self._project_name)
         self._docker_compose_file = None
+        self._project_name = None
 
-    def compose(self, docker_compose_file):
-        if docker_compose_file == self._docker_compose_file:
+    def compose(self, docker_compose_files: List[str], project_name: str):
+        if docker_compose_files == self._docker_compose_files and project_name == self._project_name:
             return
         self._down()
-        if docker_compose_file is None:
+        if docker_compose_files is None or project_name is None:
             return
-        remove_all_containers()
-        docker_compose_up(docker_compose_file)
+        docker_compose_up(docker_compose_files, project_name)
         self._networks = connect_to_all_networks()
         wait_for_nginxproxy_to_be_ready()
         time.sleep(3)  # give time to containers to be ready
-        self._docker_compose_file = docker_compose_file
+        self._docker_compose_files = docker_compose_files
+        self._project_name = project_name
 
 
 ###############################################################################
@@ -462,14 +509,14 @@ def compose(self, docker_compose_file):
 
 
 @pytest.fixture(scope="module")
-def docker_composer():
+def docker_composer() -> Iterator[DockerComposer]:
     with DockerComposer() as d:
         yield d
 
 
 @pytest.fixture
-def ca_root_certificate():
-    return CA_ROOT_CERTIFICATE
+def ca_root_certificate() -> str:
+    return CA_ROOT_CERTIFICATE.as_posix()
 
 
 @pytest.fixture
@@ -480,25 +527,38 @@ def monkey_patched_dns():
 
 
 @pytest.fixture
-def docker_compose(monkey_patched_dns, docker_composer, docker_compose_file):
-    """Ensures containers described in a docker compose file are started.
+def docker_compose(
+        request: FixtureRequest,
+        monkeypatch,
+        monkey_patched_dns,
+        docker_composer,
+        docker_compose_files
+) -> Iterator[DockerClient]:
+    """
+    Ensures containers necessary for the test module are started in a compose project,
+    and set the environment variable `PYTEST_MODULE_PATH` to the test module's parent folder.
 
-    A custom docker compose file name can be specified by overriding the `docker_compose_file`
-    fixture.
+    A list of custom docker compose files path can be specified by overriding
+    the `docker_compose_file` fixture.
 
-    Also, in the case where pytest is running from a docker container, this fixture makes sure
-    our container will be attached to all the docker networks.
+    Also, in the case where pytest is running from a docker container, this fixture
+    makes sure our container will be attached to all the docker networks.
     """
-    docker_composer.compose(docker_compose_file)
+    pytest_module_path = pathlib.Path(request.module.__file__).parent
+    monkeypatch.setenv("PYTEST_MODULE_PATH", pytest_module_path.as_posix())
+
+    project_name = request.module.__name__
+    docker_composer.compose(docker_compose_files, project_name)
+
     yield docker_client
 
 
-@pytest.fixture()
-def nginxproxy():
+@pytest.fixture
+def nginxproxy() -> Iterator[RequestsForDocker]:
     """
     Provides the `nginxproxy` object that can be used in the same way the requests module is:
 
-    r = nginxproxy.get("http://foo.com")
+    r = nginxproxy.get("https://foo.com")
 
     The difference is that in case an HTTP requests has status code 404 or 502 (which mostly
     indicates that nginx has just reloaded), we retry up to 30 times the query.
@@ -507,11 +567,11 @@ def nginxproxy():
     made against containers to use the containers IPv6 address when set to `True`. If IPv6 is not
     supported by the system or docker, that particular test will be skipped.
     """
-    yield requests_for_docker()
+    yield RequestsForDocker()
 
 
-@pytest.fixture()
-def acme_challenge_path():
+@pytest.fixture
+def acme_challenge_path() -> str:
     """
     Provides fake Let's Encrypt ACME challenge path used in certain tests
     """
@@ -523,14 +583,13 @@ def acme_challenge_path():
 #
 ###############################################################################
 
-# pytest hook to display additionnal stuff in test report
+# pytest hook to display additional stuff in test report
 def pytest_runtest_logreport(report):
     if report.failed:
-        if isinstance(report.longrepr, ReprExceptionInfo):
-            test_containers = docker_client.containers.list(all=True, filters={"ancestor": "nginxproxy/nginx-proxy:test"})
-            for container in test_containers:
-                report.longrepr.addsection('nginx-proxy logs', container.logs())
-                report.longrepr.addsection('nginx-proxy conf', get_nginx_conf_from_container(container))
+        test_containers = docker_client.containers.list(all=True, filters={"ancestor": "nginxproxy/nginx-proxy:test"})
+        for container in test_containers:
+            report.longrepr.addsection('nginx-proxy logs', container.logs().decode())
+            report.longrepr.addsection('nginx-proxy conf', get_nginx_conf_from_container(container).decode())
 
 
 # Py.test `incremental` marker, see http://stackoverflow.com/a/12579625/107049
@@ -557,5 +616,5 @@ def pytest_runtest_setup(item):
 except docker.errors.ImageNotFound:
     pytest.exit("The docker image 'nginxproxy/nginx-proxy:test' is missing")
 
-if LooseVersion(docker.__version__) < LooseVersion("5.0.0"):
-    pytest.exit("This test suite is meant to work with the python docker module v5.0.0 or later")
+if Version(docker.__version__) < Version("7.0.0"):
+    pytest.exit("This test suite is meant to work with the python docker module v7.0.0 or later")
diff --git a/test/pytest.sh b/test/pytest.sh
index 9cbe75017..30e40de24 100755
--- a/test/pytest.sh
+++ b/test/pytest.sh
@@ -3,7 +3,7 @@
 #                                                                             #
 # This script is meant to run the test suite from a Docker container.         #
 #                                                                             #
-# This is usefull when you want to run the test suite from Mac or             #
+# This is useful when you want to run the test suite from Mac or             #
 # Docker Toolbox.                                                             #
 #                                                                             #
 ###############################################################################
diff --git a/test/requirements/Dockerfile-nginx-proxy-tester b/test/requirements/Dockerfile-nginx-proxy-tester
index 1af4a16b2..90f6c5bd0 100644
--- a/test/requirements/Dockerfile-nginx-proxy-tester
+++ b/test/requirements/Dockerfile-nginx-proxy-tester
@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.12
 
 ENV PYTEST_RUNNING_IN_CONTAINER=1
 
@@ -10,14 +10,13 @@ RUN apt-get update \
   && apt-get install -y \
     ca-certificates \
     curl \
-    gnupg \
   && install -m 0755 -d /etc/apt/keyrings \
-  && curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg \
-  && chmod a+r /etc/apt/keyrings/docker.gpg
+  && curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
+  && chmod a+r /etc/apt/keyrings/docker.asc
 
 # Add the Docker repository to Apt sources
 RUN echo \
-  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
   $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
   tee /etc/apt/sources.list.d/docker.list > /dev/null
 
diff --git a/test/requirements/python-requirements.txt b/test/requirements/python-requirements.txt
index e8236945c..e90960380 100644
--- a/test/requirements/python-requirements.txt
+++ b/test/requirements/python-requirements.txt
@@ -1,4 +1,6 @@
 backoff==2.2.1
 docker==7.1.0
-pytest==8.3.3
+packaging==24.2
+pytest==8.3.4
 requests==2.32.3
+urllib3==2.3.0
diff --git a/test/requirements/web/webserver.py b/test/requirements/web/webserver.py
index c4750bdb1..3b584ed29 100755
--- a/test/requirements/web/webserver.py
+++ b/test/requirements/web/webserver.py
@@ -28,7 +28,7 @@ def do_GET(self):
         self.send_header("Content-Type", "text/plain")
         self.end_headers()
 
-        if (len(response_body)):
+        if len(response_body):
             self.wfile.write(response_body.encode())
 
 if __name__ == '__main__':
diff --git a/test/stress_tests/README.md b/test/stress_tests/README.md
deleted file mode 100644
index ca20cc109..000000000
--- a/test/stress_tests/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains tests that showcase scenarios known to break the expected behavior of nginx-proxy.
\ No newline at end of file
diff --git a/test/test_acme_http_challenge_location/acme_root/.well-known/acme-challenge/test-filename b/test/test_acme-http-challenge-location/acme_root/.well-known/acme-challenge/test-filename
similarity index 100%
rename from test/test_acme_http_challenge_location/acme_root/.well-known/acme-challenge/test-filename
rename to test/test_acme-http-challenge-location/acme_root/.well-known/acme-challenge/test-filename
diff --git a/test/test_acme_http_challenge_location/certs/nginx-proxy.tld.crt b/test/test_acme-http-challenge-location/certs/nginx-proxy.tld.crt
similarity index 100%
rename from test/test_acme_http_challenge_location/certs/nginx-proxy.tld.crt
rename to test/test_acme-http-challenge-location/certs/nginx-proxy.tld.crt
diff --git a/test/test_acme_http_challenge_location/certs/nginx-proxy.tld.key b/test/test_acme-http-challenge-location/certs/nginx-proxy.tld.key
similarity index 100%
rename from test/test_acme_http_challenge_location/certs/nginx-proxy.tld.key
rename to test/test_acme-http-challenge-location/certs/nginx-proxy.tld.key
diff --git a/test/test_acme-http-challenge-location/compose.base.override.yml b/test/test_acme-http-challenge-location/compose.base.override.yml
new file mode 100644
index 000000000..6bef2d35b
--- /dev/null
+++ b/test/test_acme-http-challenge-location/compose.base.override.yml
@@ -0,0 +1,6 @@
+services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.py b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.py
similarity index 98%
rename from test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.py
rename to test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.py
index acbc8feb9..ae12fa64a 100644
--- a/test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.py
+++ b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_redirect_acme_challenge_location_disabled(docker_compose, nginxproxy, acme_challenge_path):
     r = nginxproxy.get(
         f"http://web1.nginx-proxy.tld/{acme_challenge_path}",
diff --git a/test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.yml b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.yml
similarity index 78%
rename from test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.yml
rename to test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.yml
index 3cd4f2d62..587aa49bb 100644
--- a/test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.yml
+++ b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-disabled.yml
@@ -1,6 +1,8 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      ACME_HTTP_CHALLENGE_LOCATION: "false"
+
   web1:
     image: web
     expose:
@@ -36,12 +38,3 @@ services:
       VIRTUAL_HOST: "web4.nginx-proxy.tld"
       HTTPS_METHOD: noredirect
       ACME_HTTP_CHALLENGE_LOCATION: "true"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    environment:
-      ACME_HTTP_CHALLENGE_LOCATION: "false"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.py b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.py
similarity index 98%
rename from test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.py
rename to test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.py
index fd06e847d..88cb07d7e 100644
--- a/test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.py
+++ b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_redirect_acme_challenge_location_enabled(docker_compose, nginxproxy, acme_challenge_path):
     r = nginxproxy.get(
         f"http://web1.nginx-proxy.tld/{acme_challenge_path}",
diff --git a/test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.yml b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.yml
similarity index 77%
rename from test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.yml
rename to test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.yml
index 41439e30c..eda25afce 100644
--- a/test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.yml
+++ b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-enabled-is-default.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web
@@ -36,10 +34,3 @@ services:
       VIRTUAL_HOST: "web4.nginx-proxy.tld"
       HTTPS_METHOD: noredirect
       ACME_HTTP_CHALLENGE_LOCATION: "false"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.py b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.py
similarity index 96%
rename from test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.py
rename to test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.py
index d2051d0aa..ed9f25a63 100644
--- a/test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.py
+++ b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_redirect_acme_challenge_location_legacy(docker_compose, nginxproxy, acme_challenge_path):
     r = nginxproxy.get(
         f"http://web1.nginx-proxy.tld/{acme_challenge_path}",
diff --git a/test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.yml
similarity index 64%
rename from test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml
rename to test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.yml
index 693f9e013..e4fc01fc5 100644
--- a/test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml
+++ b/test/test_acme-http-challenge-location/test_acme-http-challenge-location-legacy.yml
@@ -1,6 +1,8 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      ACME_HTTP_CHALLENGE_LOCATION: "legacy"
+
   web1:
     image: web
     expose:
@@ -17,12 +19,3 @@ services:
       WEB_PORTS: "82"
       VIRTUAL_HOST: "web2.nginx-proxy.tld"
       HTTPS_METHOD: noredirect
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    environment:
-      ACME_HTTP_CHALLENGE_LOCATION: "legacy"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_build.py b/test/test_build/test_build.py
similarity index 90%
rename from test/test_build.py
rename to test/test_build/test_build.py
index 4052d1ee0..3931fcd4e 100644
--- a/test/test_build.py
+++ b/test/test_build/test_build.py
@@ -1,22 +1,25 @@
 """
 Test that nginx-proxy-tester can build successfully
 """
-import pytest
-import docker
+import pathlib
 import re
-import os
+
+import docker
+import pytest
+
 
 client = docker.from_env()
 
 @pytest.fixture(scope = "session")
 def docker_build(request):
     # Define Dockerfile path
-    dockerfile_path = os.path.join(os.path.dirname(__file__), "requirements/")
+    current_file_path = pathlib.Path(__file__)
+    dockerfile_path = current_file_path.parent.parent.joinpath("requirements")
     dockerfile_name = "Dockerfile-nginx-proxy-tester"
 
     # Build the Docker image
     image, logs = client.images.build(
-        path = dockerfile_path,
+        path = dockerfile_path.as_posix(),
         dockerfile = dockerfile_name,
         rm = True,  # Remove intermediate containers
         tag = "nginx-proxy-tester-ci",  # Tag for the built image
diff --git a/test/test_custom-error-page/test_custom-error-page.py b/test/test_custom-error-page/test_custom-error-page.py
index 32cb0b542..6317aeaac 100644
--- a/test/test_custom-error-page/test_custom-error-page.py
+++ b/test/test_custom-error-page/test_custom-error-page.py
@@ -1,4 +1,3 @@
-import pytest
 import re
 
 
diff --git a/test/test_custom-error-page/test_custom-error-page.yml b/test/test_custom-error-page/test_custom-error-page.yml
index 419b7eb8d..b0aa7db38 100644
--- a/test/test_custom-error-page/test_custom-error-page.yml
+++ b/test/test_custom-error-page/test_custom-error-page.yml
@@ -1,8 +1,5 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
+  nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./50x.html:/usr/share/nginx/html/errors/50x.html:ro
+      - ${PYTEST_MODULE_PATH}/50x.html:/usr/share/nginx/html/errors/50x.html:ro
diff --git a/test/test_custom/test_defaults-location.py b/test/test_custom/test_defaults-location.py
index 5af359da0..94d0fa17e 100644
--- a/test/test_custom/test_defaults-location.py
+++ b/test/test_custom/test_defaults-location.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_custom_default_conf_does_not_apply_to_unknown_vhost(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy/")
     assert r.status_code == 503
diff --git a/test/test_custom/test_defaults-location.yml b/test/test_custom/test_defaults-location.yml
index 6e8965057..c408099b2 100644
--- a/test/test_custom/test_defaults-location.yml
+++ b/test/test_custom/test_defaults-location.yml
@@ -1,19 +1,16 @@
-version: "2"
-
 services:
   nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/default_location:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/web3.nginx-proxy.example_location:ro
+      - ${PYTEST_MODULE_PATH}/my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/default_location:ro
+      - ${PYTEST_MODULE_PATH}/my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/web3.nginx-proxy.example_location:ro
 
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.example
 
   web2:
@@ -21,7 +18,7 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.example
 
   web3:
@@ -29,5 +26,5 @@ services:
     expose:
       - "83"
     environment:
-      WEB_PORTS: 83
+      WEB_PORTS: "83"
       VIRTUAL_HOST: web3.nginx-proxy.example
diff --git a/test/test_custom/test_defaults.py b/test/test_custom/test_defaults.py
index c9cb2dfb0..dc0fec9ce 100644
--- a/test/test_custom/test_defaults.py
+++ b/test/test_custom/test_defaults.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_custom_conf_does_not_apply_to_unknown_vhost(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy/")
     assert r.status_code == 503
diff --git a/test/test_custom/test_defaults.yml b/test/test_custom/test_defaults.yml
index 2f25387ba..3df04b782 100644
--- a/test/test_custom/test_defaults.yml
+++ b/test/test_custom/test_defaults.yml
@@ -1,18 +1,15 @@
-version: "2"
-
 services:
   nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/proxy.conf:ro
+      - ${PYTEST_MODULE_PATH}/my_custom_proxy_settings_f00.conf:/etc/nginx/proxy.conf:ro
 
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.example
 
   web2:
@@ -20,5 +17,5 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.example
diff --git a/test/test_custom/test_location-per-vhost.py b/test/test_custom/test_location-per-vhost.py
index 8218ed073..20d033a91 100644
--- a/test/test_custom/test_location-per-vhost.py
+++ b/test/test_custom/test_location-per-vhost.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_custom_conf_does_not_apply_to_unknown_vhost(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy/")
     assert r.status_code == 503
diff --git a/test/test_custom/test_location-per-vhost.yml b/test/test_custom/test_location-per-vhost.yml
index 71e606ab4..dd46a21c7 100644
--- a/test/test_custom/test_location-per-vhost.yml
+++ b/test/test_custom/test_location-per-vhost.yml
@@ -1,19 +1,16 @@
-version: "2"
-
 services:
   nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example_location:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430_location:ro
+      - ${PYTEST_MODULE_PATH}/my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example_location:ro
+      - ${PYTEST_MODULE_PATH}/my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430_location:ro
 
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.example
 
   web2:
@@ -21,7 +18,7 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.example
   
   regex:
@@ -29,5 +26,5 @@ services:
     expose:
       - "83"
     environment:
-      WEB_PORTS: 83
+      WEB_PORTS: "83"
       VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$
diff --git a/test/test_custom/test_per-vhost.py b/test/test_custom/test_per-vhost.py
index 7394472d2..24dd437fd 100644
--- a/test/test_custom/test_per-vhost.py
+++ b/test/test_custom/test_per-vhost.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_custom_conf_does_not_apply_to_unknown_vhost(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy/")
     assert r.status_code == 503
diff --git a/test/test_custom/test_per-vhost.yml b/test/test_custom/test_per-vhost.yml
index 0795cef17..8813d5e2e 100644
--- a/test/test_custom/test_per-vhost.yml
+++ b/test/test_custom/test_per-vhost.yml
@@ -1,19 +1,16 @@
-version: "2"
-
 services:
   nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430:ro
+      - ${PYTEST_MODULE_PATH}/my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example:ro
+      - ${PYTEST_MODULE_PATH}/my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430:ro
 
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.example
 
   web2:
@@ -21,7 +18,7 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.example
   
   regex:
@@ -29,5 +26,5 @@ services:
     expose:
       - "83"
     environment:
-      WEB_PORTS: 83
+      WEB_PORTS: "83"
       VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$
diff --git a/test/test_custom/test_proxy-wide.py b/test/test_custom/test_proxy-wide.py
index c9cb2dfb0..dc0fec9ce 100644
--- a/test/test_custom/test_proxy-wide.py
+++ b/test/test_custom/test_proxy-wide.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_custom_conf_does_not_apply_to_unknown_vhost(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy/")
     assert r.status_code == 503
diff --git a/test/test_custom/test_proxy-wide.yml b/test/test_custom/test_proxy-wide.yml
index 22e5c1857..747bddae3 100644
--- a/test/test_custom/test_proxy-wide.yml
+++ b/test/test_custom/test_proxy-wide.yml
@@ -1,18 +1,15 @@
-version: "2"
-
 services:
   nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/conf.d/my_custom_proxy_settings_f00.conf:ro
+      - ${PYTEST_MODULE_PATH}/my_custom_proxy_settings_f00.conf:/etc/nginx/conf.d/my_custom_proxy_settings_f00.conf:ro
 
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.example
 
   web2:
@@ -20,5 +17,5 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.example
diff --git a/test/test_debug_endpoint/test_global.py b/test/test_debug-endpoint/test_global.py
similarity index 99%
rename from test/test_debug_endpoint/test_global.py
rename to test/test_debug-endpoint/test_global.py
index aaa7b1fc0..cf0f8b75b 100644
--- a/test/test_debug_endpoint/test_global.py
+++ b/test/test_debug-endpoint/test_global.py
@@ -1,6 +1,8 @@
 import json
+
 import pytest
 
+
 def test_debug_endpoint_is_enabled_globally(docker_compose, nginxproxy):
     r = nginxproxy.get("http://enabled.debug.nginx-proxy.example/nginx-proxy-debug")
     assert r.status_code == 200
diff --git a/test/test_debug_endpoint/test_global.yml b/test/test_debug-endpoint/test_global.yml
similarity index 85%
rename from test/test_debug_endpoint/test_global.yml
rename to test/test_debug-endpoint/test_global.yml
index 179703899..d4be9139f 100644
--- a/test/test_debug_endpoint/test_global.yml
+++ b/test/test_debug-endpoint/test_global.yml
@@ -1,8 +1,5 @@
 services:
   nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
     environment:
       DEBUG_ENDPOINT: "true"
 
@@ -11,7 +8,7 @@ services:
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: enabled.debug.nginx-proxy.example
   
   debug_stripped:
@@ -19,7 +16,7 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST_MULTIPORTS: |-
         stripped.debug.nginx-proxy.example:
           "/1":
@@ -48,7 +45,7 @@ services:
     expose:
       - "84"
     environment:
-      WEB_PORTS: 84
+      WEB_PORTS: "84"
       VIRTUAL_HOST: ~^regexp.*\.debug.nginx-proxy.example
 
   debug_disabled:
@@ -56,7 +53,7 @@ services:
     expose:
       - "83"
     environment:
-      WEB_PORTS: 83
+      WEB_PORTS: "83"
       VIRTUAL_HOST: disabled.debug.nginx-proxy.example
     labels:
       com.github.nginx-proxy.nginx-proxy.debug-endpoint: "false"
diff --git a/test/test_debug_endpoint/test_per_container.py b/test/test_debug-endpoint/test_per-container.py
similarity index 99%
rename from test/test_debug_endpoint/test_per_container.py
rename to test/test_debug-endpoint/test_per-container.py
index 16c680c33..ffc4db1fd 100644
--- a/test/test_debug_endpoint/test_per_container.py
+++ b/test/test_debug-endpoint/test_per-container.py
@@ -1,6 +1,8 @@
 import json
+
 import pytest
 
+
 def test_debug_endpoint_is_disabled_globally(docker_compose, nginxproxy):
     r = nginxproxy.get("http://disabled1.debug.nginx-proxy.example/nginx-proxy-debug")
     assert r.status_code == 404 
diff --git a/test/test_debug_endpoint/test_per_container.yml b/test/test_debug-endpoint/test_per-container.yml
similarity index 73%
rename from test/test_debug_endpoint/test_per_container.yml
rename to test/test_debug-endpoint/test_per-container.yml
index 56c975cfe..d6a381a10 100644
--- a/test/test_debug_endpoint/test_per_container.yml
+++ b/test/test_debug-endpoint/test_per-container.yml
@@ -1,15 +1,10 @@
 services:
-  nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-
   debug_disabled1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: disabled1.debug.nginx-proxy.example
   
   debug_disabled2:
@@ -17,7 +12,7 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: disabled2.debug.nginx-proxy.example
 
 
@@ -26,7 +21,7 @@ services:
     expose:
       - "83"
     environment:
-      WEB_PORTS: 83
+      WEB_PORTS: "83"
       VIRTUAL_HOST: enabled.debug.nginx-proxy.example
     labels:
       com.github.nginx-proxy.nginx-proxy.debug-endpoint: "true"
diff --git a/test/test_default-host.yml b/test/test_default-host.yml
deleted file mode 100644
index 405bb081a..000000000
--- a/test/test_default-host.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "2"
-
-services:
-  # GIVEN a webserver with VIRTUAL_HOST set to web1.tld
-  web1:
-    image: web
-    expose:
-      - "81"
-    environment:
-      WEB_PORTS: 81
-      VIRTUAL_HOST: web1.tld
-
-  # WHEN nginx-proxy runs with DEFAULT_HOST set to web1.tld
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      DEFAULT_HOST: web1.tld
diff --git a/test/test_default-host.py b/test/test_default-host/test_default-host.py
similarity index 92%
rename from test/test_default-host.py
rename to test/test_default-host/test_default-host.py
index 90809a5cc..560baf745 100644
--- a/test/test_default-host.py
+++ b/test/test_default-host/test_default-host.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_fallback_on_default(docker_compose, nginxproxy):
     r = nginxproxy.get("http://unknown.nginx-proxy.tld/port")
     assert r.status_code == 200
diff --git a/test/test_default-host/test_default-host.yml b/test/test_default-host/test_default-host.yml
new file mode 100644
index 000000000..458cb39bb
--- /dev/null
+++ b/test/test_default-host/test_default-host.yml
@@ -0,0 +1,12 @@
+services:
+  nginx-proxy:
+    environment:
+      DEFAULT_HOST: web1.tld
+
+  web1:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: web1.tld
diff --git a/test/test_DOCKER_HOST_unix_socket.py b/test/test_docker-unix-socket/test_docker-unix-socket.py
similarity index 97%
rename from test/test_DOCKER_HOST_unix_socket.py
rename to test/test_docker-unix-socket/test_docker-unix-socket.py
index b31da1627..c7e72114d 100644
--- a/test/test_DOCKER_HOST_unix_socket.py
+++ b/test/test_docker-unix-socket/test_docker-unix-socket.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_unknown_virtual_host(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy/port")
     assert r.status_code == 503
diff --git a/test/test_DOCKER_HOST_unix_socket.yml b/test/test_docker-unix-socket/test_docker-unix-socket.yml
similarity index 76%
rename from test/test_DOCKER_HOST_unix_socket.yml
rename to test/test_docker-unix-socket/test_docker-unix-socket.yml
index caeaa2a55..03cb41457 100644
--- a/test/test_DOCKER_HOST_unix_socket.yml
+++ b/test/test_docker-unix-socket/test_docker-unix-socket.yml
@@ -1,12 +1,16 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/f00.sock:ro
+    environment:
+      DOCKER_HOST: unix:///f00.sock
+
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.tld
 
   web2:
@@ -14,12 +18,5 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.tld
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/f00.sock:ro
-    environment:
-      DOCKER_HOST: unix:///f00.sock
diff --git a/test/test_dockergen/.gitignore b/test/test_dockergen/.gitignore
deleted file mode 100644
index 98c0b068e..000000000
--- a/test/test_dockergen/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-nginx.tmpl
\ No newline at end of file
diff --git a/test/test_dockergen/test_dockergen_v3.yml b/test/test_dockergen/test_dockergen.base.yml
similarity index 75%
rename from test/test_dockergen/test_dockergen_v3.yml
rename to test/test_dockergen/test_dockergen.base.yml
index 7e4aef8c1..69f6c85a2 100644
--- a/test/test_dockergen/test_dockergen_v3.yml
+++ b/test/test_dockergen/test_dockergen.base.yml
@@ -1,13 +1,18 @@
-version: "3"
+volumes:
+  nginx_conf:
+
 
 services:
-  nginx:
+  nginx-proxy-nginx:
     image: nginx
     container_name: nginx
     volumes:
-      - nginx_conf:/etc/nginx/conf.d
+      - nginx_conf:/etc/nginx/conf.d:ro
+    ports:
+      - "80:80"
+      - "443:443"
 
-  dockergen:
+  nginx-proxy-dockergen:
     image: nginxproxy/docker-gen
     command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
     volumes:
@@ -21,8 +26,5 @@ services:
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: whoami.nginx.container.docker
-
-volumes:
-  nginx_conf: {}
diff --git a/test/test_dockergen/test_dockergen_v3.py b/test/test_dockergen/test_dockergen.py
similarity index 88%
rename from test/test_dockergen/test_dockergen_v3.py
rename to test/test_dockergen/test_dockergen.py
index b696e6c62..6d419cd37 100644
--- a/test/test_dockergen/test_dockergen_v3.py
+++ b/test/test_dockergen/test_dockergen.py
@@ -1,11 +1,11 @@
 import docker
 import pytest
-from distutils.version import LooseVersion
+from packaging.version import Version
 
 
 raw_version = docker.from_env().version()["Version"]
 pytestmark = pytest.mark.skipif(
-    LooseVersion(raw_version) < LooseVersion("1.13"),
+    Version(raw_version) < Version("1.13"),
     reason="Docker compose syntax v3 requires docker engine v1.13 or later (got {raw_version})"
 )
 
diff --git a/test/test_dockergen/test_dockergen_v2.py b/test/test_dockergen/test_dockergen_v2.py
deleted file mode 100644
index dbb15d47f..000000000
--- a/test/test_dockergen/test_dockergen_v2.py
+++ /dev/null
@@ -1,10 +0,0 @@
-def test_unknown_virtual_host_is_503(docker_compose, nginxproxy):
-    r = nginxproxy.get("http://unknown.nginx.container.docker/")
-    assert r.status_code == 503
-
-
-def test_forwards_to_whoami(docker_compose, nginxproxy):
-    r = nginxproxy.get("http://whoami.nginx.container.docker/")
-    assert r.status_code == 200
-    whoami_container = docker_compose.containers.get("whoami")
-    assert r.text == f"I'm {whoami_container.id[:12]}\n"
diff --git a/test/test_dockergen/test_dockergen_v2.yml b/test/test_dockergen/test_dockergen_v2.yml
deleted file mode 100644
index f98992f20..000000000
--- a/test/test_dockergen/test_dockergen_v2.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-version: "2"
-
-services:
-  nginx:
-    image: nginx
-    container_name: nginx
-    volumes:
-      - /etc/nginx/conf.d
-
-  dockergen:
-    image: nginxproxy/docker-gen
-    command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
-    volumes_from:
-      - nginx
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ../../nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl
-
-  web:
-    image: web
-    container_name: whoami
-    expose:
-      - "80"
-    environment:
-      WEB_PORTS: 80
-      VIRTUAL_HOST: whoami.nginx.container.docker
diff --git a/test/test_enable_http_on_missing_cert.py b/test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.py
similarity index 98%
rename from test/test_enable_http_on_missing_cert.py
rename to test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.py
index cdedc8a2c..cda948c93 100644
--- a/test/test_enable_http_on_missing_cert.py
+++ b/test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_nohttp_missing_cert_disabled(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nohttp-missing-cert-disabled.nginx-proxy.tld/", allow_redirects=False)
     assert r.status_code == 503
diff --git a/test/test_enable_http_on_missing_cert.yml b/test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.yml
similarity index 84%
rename from test/test_enable_http_on_missing_cert.yml
rename to test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.yml
index 1149ef720..56db74393 100644
--- a/test/test_enable_http_on_missing_cert.yml
+++ b/test/test_enable-http-on-missing-cert/test_enable-http-on-missing-cert.yml
@@ -1,11 +1,5 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+  nginx-proxy:
     environment:
       ENABLE_HTTP_ON_MISSING_CERT: "false"
 
diff --git a/test/test_events.py b/test/test_events/test_events.py
similarity index 93%
rename from test/test_events.py
rename to test/test_events/test_events.py
index 9b99e93b8..e137c8700 100644
--- a/test/test_events.py
+++ b/test/test_events/test_events.py
@@ -7,7 +7,7 @@
 from docker.errors import NotFound
 
 
-@pytest.fixture()
+@pytest.fixture
 def web1(docker_compose):
     """
     pytest fixture creating a web container with `VIRTUAL_HOST=web1.nginx-proxy` listening on port 81.
@@ -22,7 +22,7 @@ def web1(docker_compose):
         },
         ports={"81/tcp": None}
     )
-    docker_compose.networks.get("test_default").connect(container)
+    docker_compose.networks.get("test_events-net").connect(container)
     sleep(2)  # give it some time to initialize and for docker-gen to detect it
     yield container
     try:
@@ -30,7 +30,7 @@ def web1(docker_compose):
     except NotFound:
         pass
 
-@pytest.fixture()
+@pytest.fixture
 def web2(docker_compose):
     """
     pytest fixture creating a web container with `VIRTUAL_HOST=nginx-proxy`, `VIRTUAL_PATH=/web2/` and `VIRTUAL_DEST=/` listening on port 82.
@@ -47,7 +47,7 @@ def web2(docker_compose):
         },
         ports={"82/tcp": None}
     )
-    docker_compose.networks.get("test_default").connect(container)
+    docker_compose.networks.get("test_events-net").connect(container)
     sleep(2)  # give it some time to initialize and for docker-gen to detect it
     yield container
     try:
diff --git a/test/test_events/test_events.yml b/test/test_events/test_events.yml
new file mode 100644
index 000000000..cd7fb8f7f
--- /dev/null
+++ b/test/test_events/test_events.yml
@@ -0,0 +1,3 @@
+networks:
+  default:
+    name: test_events-net
diff --git a/test/test_fallback.data/custom-fallback.yml b/test/test_fallback.data/custom-fallback.yml
deleted file mode 100644
index a15044181..000000000
--- a/test/test_fallback.data/custom-fallback.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: "2"
-
-services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./custom-fallback.conf:/etc/nginx/conf.d/zzz-custom-fallback.conf:ro
-
-  http-only:
-    image: web
-    expose:
-      - "83"
-    environment:
-      WEB_PORTS: "83"
-      VIRTUAL_HOST: http-only.nginx-proxy.test
-      HTTPS_METHOD: nohttps
diff --git a/test/test_fallback/test_fallback.data/compose.base.yml b/test/test_fallback/test_fallback.data/compose.base.yml
new file mode 100644
index 000000000..36e804bc0
--- /dev/null
+++ b/test/test_fallback/test_fallback.data/compose.base.yml
@@ -0,0 +1,9 @@
+services:
+  nginx-proxy:
+    image: nginxproxy/nginx-proxy:test
+    container_name: nginx-proxy
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    ports:
+      - "80:80"
+      - "443:443"
diff --git a/test/test_fallback.data/custom-fallback.conf b/test/test_fallback/test_fallback.data/custom-fallback.conf
similarity index 100%
rename from test/test_fallback.data/custom-fallback.conf
rename to test/test_fallback/test_fallback.data/custom-fallback.conf
diff --git a/test/test_fallback.data/nohttps.yml b/test/test_fallback/test_fallback.data/custom-fallback.yml
similarity index 64%
rename from test/test_fallback.data/nohttps.yml
rename to test/test_fallback/test_fallback.data/custom-fallback.yml
index c73349247..32c01b9b7 100644
--- a/test/test_fallback.data/nohttps.yml
+++ b/test/test_fallback/test_fallback.data/custom-fallback.yml
@@ -1,12 +1,8 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
+  nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      HTTPS_METHOD: nohttps
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/custom-fallback.conf:/etc/nginx/conf.d/zzz-custom-fallback.conf:ro
 
   http-only:
     image: web
@@ -15,3 +11,4 @@ services:
     environment:
       WEB_PORTS: "83"
       VIRTUAL_HOST: http-only.nginx-proxy.test
+      HTTPS_METHOD: nohttps
diff --git a/test/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.crt b/test/test_fallback/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.crt
similarity index 100%
rename from test/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.crt
rename to test/test_fallback/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.crt
diff --git a/test/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.key b/test/test_fallback/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.key
similarity index 100%
rename from test/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.key
rename to test/test_fallback/test_fallback.data/nodefault.certs/http-only.nginx-proxy.test.key
diff --git a/test/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.crt b/test/test_fallback/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.crt
similarity index 100%
rename from test/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.crt
rename to test/test_fallback/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.crt
diff --git a/test/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.key b/test/test_fallback/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.key
similarity index 100%
rename from test/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.key
rename to test/test_fallback/test_fallback.data/nodefault.certs/https-and-http.nginx-proxy.test.key
diff --git a/test/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.crt b/test/test_fallback/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.crt
similarity index 100%
rename from test/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.crt
rename to test/test_fallback/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.crt
diff --git a/test/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.key b/test/test_fallback/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.key
similarity index 100%
rename from test/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.key
rename to test/test_fallback/test_fallback.data/nodefault.certs/https-only.nginx-proxy.test.key
diff --git a/test/test_fallback.data/nodefault.yml b/test/test_fallback/test_fallback.data/nodefault.yml
similarity index 86%
rename from test/test_fallback.data/nodefault.yml
rename to test/test_fallback/test_fallback.data/nodefault.yml
index 6397a0bc6..34724ce3b 100644
--- a/test/test_fallback.data/nodefault.yml
+++ b/test/test_fallback/test_fallback.data/nodefault.yml
@@ -1,11 +1,8 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
+  nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./nodefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/nodefault.certs:/etc/nginx/certs:ro
 
   https-and-http:
     image: web
diff --git a/test/test_fallback.data/nohttp-on-app.yml b/test/test_fallback/test_fallback.data/nohttp-on-app.yml
similarity index 72%
rename from test/test_fallback.data/nohttp-on-app.yml
rename to test/test_fallback/test_fallback.data/nohttp-on-app.yml
index b6ca82a19..8e13fcb38 100644
--- a/test/test_fallback.data/nohttp-on-app.yml
+++ b/test/test_fallback/test_fallback.data/nohttp-on-app.yml
@@ -1,11 +1,8 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
+  nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
     environment:
       HTTPS_METHOD: redirect
 
diff --git a/test/test_fallback.data/nohttp-with-missing-cert.yml b/test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml
similarity index 52%
rename from test/test_fallback.data/nohttp-with-missing-cert.yml
rename to test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml
index 70ece7b77..47b7d9245 100644
--- a/test/test_fallback.data/nohttp-with-missing-cert.yml
+++ b/test/test_fallback/test_fallback.data/nohttp-with-missing-cert.yml
@@ -1,11 +1,8 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
+  nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
     environment:
       HTTPS_METHOD: nohttp
 
@@ -24,3 +21,13 @@ services:
     environment:
       WEB_PORTS: "84"
       VIRTUAL_HOST: missing-cert.nginx-proxy.test
+
+  missing-cert-default-untrusted:
+    image: web
+    expose:
+      - "85"
+    environment:
+      WEB_PORTS: "85"
+      VIRTUAL_HOST: missing-cert.default-untrusted.nginx-proxy.test
+    labels:
+      com.github.nginx-proxy.nginx-proxy.trust-default-cert: "false"
diff --git a/test/test_fallback.data/nohttp.yml b/test/test_fallback/test_fallback.data/nohttp.yml
similarity index 70%
rename from test/test_fallback.data/nohttp.yml
rename to test/test_fallback/test_fallback.data/nohttp.yml
index 9d47d51a3..5f1ec5978 100644
--- a/test/test_fallback.data/nohttp.yml
+++ b/test/test_fallback/test_fallback.data/nohttp.yml
@@ -1,11 +1,8 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
+  nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
     environment:
       HTTPS_METHOD: nohttp
 
diff --git a/test/test_fallback.data/nohttps-on-app.yml b/test/test_fallback/test_fallback.data/nohttps-on-app.yml
similarity index 64%
rename from test/test_fallback.data/nohttps-on-app.yml
rename to test/test_fallback/test_fallback.data/nohttps-on-app.yml
index 966154cf9..eac59e0fe 100644
--- a/test/test_fallback.data/nohttps-on-app.yml
+++ b/test/test_fallback/test_fallback.data/nohttps-on-app.yml
@@ -1,10 +1,5 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
+  nginx-proxy:
     environment:
       HTTPS_METHOD: redirect
 
diff --git a/test/test_fallback/test_fallback.data/nohttps.yml b/test/test_fallback/test_fallback.data/nohttps.yml
new file mode 100644
index 000000000..8a03d5ea0
--- /dev/null
+++ b/test/test_fallback/test_fallback.data/nohttps.yml
@@ -0,0 +1,12 @@
+services:
+  nginx-proxy:
+    environment:
+      HTTPS_METHOD: nohttps
+
+  http-only:
+    image: web
+    expose:
+      - "83"
+    environment:
+      WEB_PORTS: "83"
+      VIRTUAL_HOST: http-only.nginx-proxy.test
diff --git a/test/test_fallback.data/withdefault.yml b/test/test_fallback/test_fallback.data/untrusteddefault.yml
similarity index 82%
rename from test/test_fallback.data/withdefault.yml
rename to test/test_fallback/test_fallback.data/untrusteddefault.yml
index 46ab1267a..e5143e1c1 100644
--- a/test/test_fallback.data/withdefault.yml
+++ b/test/test_fallback/test_fallback.data/untrusteddefault.yml
@@ -1,11 +1,10 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
+  nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
+    environment:
+      TRUST_DEFAULT_CERT: "false"
 
   https-and-http:
     image: web
diff --git a/test/test_fallback.data/withdefault.certs/default.crt b/test/test_fallback/test_fallback.data/withdefault.certs/default.crt
similarity index 100%
rename from test/test_fallback.data/withdefault.certs/default.crt
rename to test/test_fallback/test_fallback.data/withdefault.certs/default.crt
diff --git a/test/test_fallback.data/withdefault.certs/default.key b/test/test_fallback/test_fallback.data/withdefault.certs/default.key
similarity index 100%
rename from test/test_fallback.data/withdefault.certs/default.key
rename to test/test_fallback/test_fallback.data/withdefault.certs/default.key
diff --git a/test/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.crt b/test/test_fallback/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.crt
similarity index 100%
rename from test/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.crt
rename to test/test_fallback/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.crt
diff --git a/test/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.key b/test/test_fallback/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.key
similarity index 100%
rename from test/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.key
rename to test/test_fallback/test_fallback.data/withdefault.certs/http-only.nginx-proxy.test.key
diff --git a/test/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.crt b/test/test_fallback/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.crt
similarity index 100%
rename from test/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.crt
rename to test/test_fallback/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.crt
diff --git a/test/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.key b/test/test_fallback/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.key
similarity index 100%
rename from test/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.key
rename to test/test_fallback/test_fallback.data/withdefault.certs/https-and-http.nginx-proxy.test.key
diff --git a/test/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.crt b/test/test_fallback/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.crt
similarity index 100%
rename from test/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.crt
rename to test/test_fallback/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.crt
diff --git a/test/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.key b/test/test_fallback/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.key
similarity index 100%
rename from test/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.key
rename to test/test_fallback/test_fallback.data/withdefault.certs/https-only.nginx-proxy.test.key
diff --git a/test/test_fallback/test_fallback.data/withdefault.yml b/test/test_fallback/test_fallback.data/withdefault.yml
new file mode 100644
index 000000000..fe0d19ac0
--- /dev/null
+++ b/test/test_fallback/test_fallback.data/withdefault.yml
@@ -0,0 +1,49 @@
+services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/test_fallback.data/withdefault.certs:/etc/nginx/certs:ro
+
+  https-and-http:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: https-and-http.nginx-proxy.test
+
+  https-only:
+    image: web
+    expose:
+      - "82"
+    environment:
+      WEB_PORTS: "82"
+      VIRTUAL_HOST: https-only.nginx-proxy.test
+      HTTPS_METHOD: nohttp
+
+  http-only:
+    image: web
+    expose:
+      - "83"
+    environment:
+      WEB_PORTS: "83"
+      VIRTUAL_HOST: http-only.nginx-proxy.test
+      HTTPS_METHOD: nohttps
+
+  missing-cert:
+    image: web
+    expose:
+      - "84"
+    environment:
+      WEB_PORTS: "84"
+      VIRTUAL_HOST: missing-cert.nginx-proxy.test
+  
+  missing-cert-default-untrusted:
+    image: web
+    expose:
+      - "85"
+    environment:
+      WEB_PORTS: "85"
+      VIRTUAL_HOST: missing-cert.default-untrusted.nginx-proxy.test
+    labels:
+      com.github.nginx-proxy.nginx-proxy.trust-default-cert: "false"
diff --git a/test/test_fallback.py b/test/test_fallback/test_fallback.py
similarity index 68%
rename from test/test_fallback.py
rename to test/test_fallback/test_fallback.py
index a8a673aaa..0375a2d75 100644
--- a/test/test_fallback.py
+++ b/test/test_fallback/test_fallback.py
@@ -1,32 +1,32 @@
-import os.path
+import pathlib
 import re
+from typing import List, Callable
 
 import backoff
 import pytest
 import requests
+from requests import Response
 
 
 @pytest.fixture
-def data_dir():
-    return f"{os.path.splitext(__file__)[0]}.data"
+def docker_compose_files(compose_file) -> List[str]:
+    data_dir = pathlib.Path(__file__).parent.joinpath("test_fallback.data")
+    return [
+        data_dir.joinpath("compose.base.yml"),
+        data_dir.joinpath(compose_file).as_posix()
+    ]
 
 
 @pytest.fixture
-def docker_compose_file(data_dir, compose_file):
-    return os.path.join(data_dir, compose_file)
-
-
-@pytest.fixture
-def get(docker_compose, nginxproxy, want_err_re):
-
+def get(docker_compose, nginxproxy, want_err_re: re.Pattern[str]) -> Callable[[str], Response]:
     @backoff.on_exception(
         backoff.constant,
         requests.exceptions.SSLError,
-        giveup=lambda e: want_err_re and want_err_re.search(str(e)),
+        giveup=lambda e: want_err_re and bool(want_err_re.search(str(e))),
         interval=.3,
         max_tries=30,
         jitter=None)
-    def _get(url):
+    def _get(url) -> Response:
         return nginxproxy.get(url, allow_redirects=False)
 
     return _get
@@ -43,10 +43,23 @@ def _get(url):
     ("withdefault.yml", "https://https-only.nginx-proxy.test/", 200, None),
     ("withdefault.yml", "http://http-only.nginx-proxy.test/", 200, None),
     ("withdefault.yml", "https://http-only.nginx-proxy.test/", 503, None),
-    ("withdefault.yml", "http://missing-cert.nginx-proxy.test/", 200, None),
-    ("withdefault.yml", "https://missing-cert.nginx-proxy.test/", 500, None),
+    ("withdefault.yml", "http://missing-cert.nginx-proxy.test/", 301, None),
+    ("withdefault.yml", "https://missing-cert.nginx-proxy.test/", 200, None),
+    ("withdefault.yml", "http://missing-cert.default-untrusted.nginx-proxy.test/", 200, None),
+    ("withdefault.yml", "https://missing-cert.default-untrusted.nginx-proxy.test/", None, INTERNAL_ERR_RE),
     ("withdefault.yml", "http://unknown.nginx-proxy.test/", 503, None),
     ("withdefault.yml", "https://unknown.nginx-proxy.test/", 503, None),
+    # Same as withdefault.yml, except default.crt is not trusted (TRUST_DEFAULT_CERT=false).
+    ("untrusteddefault.yml", "http://https-and-http.nginx-proxy.test/", 301, None),
+    ("untrusteddefault.yml", "https://https-and-http.nginx-proxy.test/", 200, None),
+    ("untrusteddefault.yml", "http://https-only.nginx-proxy.test/", 503, None),
+    ("untrusteddefault.yml", "https://https-only.nginx-proxy.test/", 200, None),
+    ("untrusteddefault.yml", "http://http-only.nginx-proxy.test/", 200, None),
+    ("untrusteddefault.yml", "https://http-only.nginx-proxy.test/", 503, None),
+    ("untrusteddefault.yml", "http://missing-cert.nginx-proxy.test/", 200, None),
+    ("untrusteddefault.yml", "https://missing-cert.nginx-proxy.test/", None, INTERNAL_ERR_RE),
+    ("untrusteddefault.yml", "http://unknown.nginx-proxy.test/", 503, None),
+    ("untrusteddefault.yml", "https://unknown.nginx-proxy.test/", 503, None),
     # Same as withdefault.yml, except there is no default.crt.
     ("nodefault.yml", "http://https-and-http.nginx-proxy.test/", 301, None),
     ("nodefault.yml", "https://https-and-http.nginx-proxy.test/", 200, None),
@@ -68,12 +81,15 @@ def _get(url):
     ("nohttp-on-app.yml", "https://https-only.nginx-proxy.test/", 200, None),
     ("nohttp-on-app.yml", "http://unknown.nginx-proxy.test/", 503, None),
     ("nohttp-on-app.yml", "https://unknown.nginx-proxy.test/", 503, None),
-    # Same as nohttp.yml, except there is a vhost with a missing cert.  This causes its
+    # Same as nohttp.yml, except there are two vhosts with a missing cert, the second
+    # one being configured not to trust the default certificate. This causes its
     # HTTPS_METHOD=nohttp setting to effectively become HTTPS_METHOD=noredirect.
     ("nohttp-with-missing-cert.yml", "http://https-only.nginx-proxy.test/", 503, None),
     ("nohttp-with-missing-cert.yml", "https://https-only.nginx-proxy.test/", 200, None),
-    ("nohttp-with-missing-cert.yml", "http://missing-cert.nginx-proxy.test/", 200, None),
-    ("nohttp-with-missing-cert.yml", "https://missing-cert.nginx-proxy.test/", 500, None),
+    ("nohttp-with-missing-cert.yml", "http://missing-cert.nginx-proxy.test/", 503, None),
+    ("nohttp-with-missing-cert.yml", "https://missing-cert.nginx-proxy.test/", 200, None),
+    ("nohttp-with-missing-cert.yml", "http://missing-cert.default-untrusted.nginx-proxy.test/", 200, None),
+    ("nohttp-with-missing-cert.yml", "https://missing-cert.default-untrusted.nginx-proxy.test/", None, INTERNAL_ERR_RE),
     ("nohttp-with-missing-cert.yml", "http://unknown.nginx-proxy.test/", 503, None),
     ("nohttp-with-missing-cert.yml", "https://unknown.nginx-proxy.test/", 503, None),
     # HTTPS_METHOD=nohttps on nginx-proxy, HTTPS_METHOD unset on the app container.
@@ -92,7 +108,7 @@ def _get(url):
     # should prefer that server for handling requests for unknown vhosts.
     ("custom-fallback.yml", "http://unknown.nginx-proxy.test/", 418, None),
 ])
-def test_fallback(get, url, want_code, want_err_re):
+def test_fallback(get, compose_file, url, want_code, want_err_re):
     if want_err_re is None:
         r = get(url)
         assert r.status_code == want_code
diff --git a/test/test_headers/certs/default.crt b/test/test_headers/certs/default.crt
new file mode 100644
index 000000000..aed93498c
--- /dev/null
+++ b/test/test_headers/certs/default.crt
@@ -0,0 +1,70 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: O=nginx-proxy test suite, CN=www.nginx-proxy.tld
+        Validity
+            Not Before: Jan 13 03:06:39 2017 GMT
+            Not After : May 31 03:06:39 2044 GMT
+        Subject: CN=web.nginx-proxy.tld
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:95:56:c7:0d:48:a5:2b:3c:65:49:3f:26:e1:38:
+                    2b:61:30:56:e4:92:d7:63:e0:eb:ad:ac:f9:33:9b:
+                    b2:31:f1:39:13:0b:e5:43:7b:c5:bd:8a:85:c8:d9:
+                    3d:d8:ac:71:ba:16:e7:81:96:b2:ab:ae:c6:c0:bd:
+                    be:a7:d1:96:8f:b2:9b:df:ba:f9:4d:a1:3b:7e:21:
+                    4a:cd:b6:45:f9:6d:79:50:bf:24:8f:c1:6b:c1:09:
+                    19:5b:62:cb:96:e8:04:14:20:e8:d4:16:62:6a:f2:
+                    37:c1:96:e2:9d:53:05:0b:52:1d:e7:68:92:db:8b:
+                    36:68:cd:8d:5b:02:ff:12:f0:ac:5d:0c:c4:e0:7a:
+                    55:a2:49:60:9f:ff:47:1f:52:73:55:4d:d4:f2:d1:
+                    62:a2:f4:50:9d:c9:f6:f1:43:b3:dc:57:e1:31:76:
+                    b4:e0:a4:69:7e:f2:6d:34:ae:b9:8d:74:26:7b:d9:
+                    f6:07:00:ef:4b:36:61:b3:ef:7a:a1:36:3a:b6:d0:
+                    9e:f8:b8:a9:0d:4c:30:a2:ed:eb:ab:6b:eb:2e:e2:
+                    0b:28:be:f7:04:b1:e9:e0:84:d6:5d:31:77:7c:dc:
+                    d2:1f:d4:1d:71:6f:6f:6c:6d:1b:bf:31:e2:5b:c3:
+                    52:d0:14:fc:8b:fb:45:ea:41:ec:ca:c7:3b:67:12:
+                    c4:df
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Alternative Name: 
+                DNS:web.nginx-proxy.tld
+    Signature Algorithm: sha256WithRSAEncryption
+         4e:48:7d:81:66:ba:2f:50:3d:24:42:61:3f:1f:de:cf:ec:1b:
+         1b:bd:0a:67:b6:62:c8:79:9d:31:a0:fd:a9:61:ce:ff:69:bf:
+         0e:f4:f7:e6:15:2b:b0:f0:e4:f2:f4:d2:8f:74:02:b1:1e:4a:
+         a8:6f:26:0a:77:32:29:cf:dc:b5:61:82:3e:58:47:61:92:f0:
+         0c:20:25:f8:41:4d:34:09:44:bc:39:9e:aa:82:06:83:13:8b:
+         1e:2c:3d:cf:cd:1a:f7:77:39:38:e0:a3:a7:f3:09:da:02:8d:
+         73:75:38:b4:dd:24:a7:f9:03:db:98:c6:88:54:87:dc:e0:65:
+         4c:95:c5:39:9c:00:30:dc:f0:d3:2c:19:ca:f1:f4:6c:c6:d9:
+         b5:c4:4a:c7:bc:a1:2e:88:7b:b5:33:d0:ff:fb:48:5e:3e:29:
+         fa:58:e5:03:de:d8:17:de:ed:96:fc:7e:1f:fe:98:f6:be:99:
+         38:87:51:c0:d3:b7:9a:0f:26:92:e5:53:1b:d6:25:4c:ac:48:
+         f3:29:fc:74:64:9d:07:6a:25:57:24:aa:a7:70:fa:8f:6c:a7:
+         2b:b7:9d:81:46:10:32:93:b9:45:6d:0f:16:18:b2:21:1f:f3:
+         30:24:62:3f:e1:6c:07:1d:71:28:cb:4c:bb:f5:39:05:f9:b2:
+         5b:a0:05:1b
+-----BEGIN CERTIFICATE-----
+MIIC+zCCAeOgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwPzEfMB0GA1UECgwWbmdp
+bngtcHJveHkgdGVzdCBzdWl0ZTEcMBoGA1UEAwwTd3d3Lm5naW54LXByb3h5LnRs
+ZDAeFw0xNzAxMTMwMzA2MzlaFw00NDA1MzEwMzA2MzlaMB4xHDAaBgNVBAMME3dl
+Yi5uZ2lueC1wcm94eS50bGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCVVscNSKUrPGVJPybhOCthMFbkktdj4OutrPkzm7Ix8TkTC+VDe8W9ioXI2T3Y
+rHG6FueBlrKrrsbAvb6n0ZaPspvfuvlNoTt+IUrNtkX5bXlQvySPwWvBCRlbYsuW
+6AQUIOjUFmJq8jfBluKdUwULUh3naJLbizZozY1bAv8S8KxdDMTgelWiSWCf/0cf
+UnNVTdTy0WKi9FCdyfbxQ7PcV+ExdrTgpGl+8m00rrmNdCZ72fYHAO9LNmGz73qh
+Njq20J74uKkNTDCi7eura+su4gsovvcEsenghNZdMXd83NIf1B1xb29sbRu/MeJb
+w1LQFPyL+0XqQezKxztnEsTfAgMBAAGjIjAgMB4GA1UdEQQXMBWCE3dlYi5uZ2lu
+eC1wcm94eS50bGQwDQYJKoZIhvcNAQELBQADggEBAE5IfYFmui9QPSRCYT8f3s/s
+Gxu9Cme2Ysh5nTGg/alhzv9pvw709+YVK7Dw5PL00o90ArEeSqhvJgp3MinP3LVh
+gj5YR2GS8AwgJfhBTTQJRLw5nqqCBoMTix4sPc/NGvd3OTjgo6fzCdoCjXN1OLTd
+JKf5A9uYxohUh9zgZUyVxTmcADDc8NMsGcrx9GzG2bXESse8oS6Ie7Uz0P/7SF4+
+KfpY5QPe2Bfe7Zb8fh/+mPa+mTiHUcDTt5oPJpLlUxvWJUysSPMp/HRknQdqJVck
+qqdw+o9spyu3nYFGEDKTuUVtDxYYsiEf8zAkYj/hbAcdcSjLTLv1OQX5slugBRs=
+-----END CERTIFICATE-----
diff --git a/test/test_headers/certs/default.key b/test/test_headers/certs/default.key
new file mode 100644
index 000000000..8365ecfd0
--- /dev/null
+++ b/test/test_headers/certs/default.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAlVbHDUilKzxlST8m4TgrYTBW5JLXY+Drraz5M5uyMfE5Ewvl
+Q3vFvYqFyNk92KxxuhbngZayq67GwL2+p9GWj7Kb37r5TaE7fiFKzbZF+W15UL8k
+j8FrwQkZW2LLlugEFCDo1BZiavI3wZbinVMFC1Id52iS24s2aM2NWwL/EvCsXQzE
+4HpVoklgn/9HH1JzVU3U8tFiovRQncn28UOz3FfhMXa04KRpfvJtNK65jXQme9n2
+BwDvSzZhs+96oTY6ttCe+LipDUwwou3rq2vrLuILKL73BLHp4ITWXTF3fNzSH9Qd
+cW9vbG0bvzHiW8NS0BT8i/tF6kHsysc7ZxLE3wIDAQABAoIBAEmK7IecKMq7+V0y
+3mC3GpXICmKR9cRX9XgX4LkLiZuSoXrBtuuevmhzGSMp6I0VjwQHV4a3wdFORs6Q
+Ip3eVvj5Ck4Jc9BJAFVC6+WWR6tnwACFwOmSZRAw/O3GH2B3bdrDwiT/yQPFuLN7
+LKoxQiCrFdLp6rh3PBosb9pMBXU7k/HUazIdgmSKg6/JIoo/4Gwyid04TF/4MI2l
+RscxtP5/ANtS8VgwBEqhgdafRJ4KnLEpgvswgIQvUKmduVhZQlzd0LMY8FbhKVqz
+Utg8gsXaTyH6df/nmgUIInxLMz/MKPnMkv99fS6Sp/hvYlGpLZFWBJ6unMq3lKEr
+LMbHfIECgYEAxB+5QWdVqG2r9loJlf8eeuNeMPml4P8Jmi5RKyJC7Cww6DMlMxOS
+78ZJfl4b3ZrWuyvhjOfX/aTq7kQaF1BI9o3KJBH8k6EtO4gI8KeNmDONyQk9zsrn
+ru8Zwr7hVbAo8fCXxCnmPzhDLsYg6f3BVOsQWoX2SFYKZ1GvkPfIReECgYEAwu6G
+qtgFb57Vim10ecfWGM6vrPxvyfqP+zlH/p4nR+aQ+2sFbt27D0B1byWBRZe4KQyw
+Vq6XiQ09Fk6MJr8E8iAr9GXPPHcqlYI6bbNc6YOP3jVSKut0tQdTUOHll4kYIY+h
+RS3VA3+BA//ADpWpywu+7RZRbaIECA+U2a224r8CgYB5PCMIixgoRaNHZeEHF+1/
+iY1wOOKRcxY8eOU0BLnZxHd3EiasrCzoi2pi80nGczDKAxYqRCcAZDHVl8OJJdf0
+kTGjmnrHx5pucmkUWn7s1vGOlGfgrQ0K1kLWX6hrj7m/1Tn7yOrLqbvd7hvqiTI5
+jBVP3/+eN5G2zIf61TC4AQKBgCX2Q92jojNhsF58AHHy+/vqzIWYx8CC/mVDe4TX
+kfjLqzJ7XhyAK/zFZdlWaX1/FYtRAEpxR+uV226rr1mgW7s3jrfS1/ADmRRyvyQ8
+CP0k9PCmW7EmF51lptEanRbMyRlIGnUZfuFmhF6eAO4WMXHsgKs1bHg4VCapuihG
+T1aLAoGACRGn1UxFuBGqtsh2zhhsBZE7GvXKJSk/eP7QJeEXUNpNjCpgm8kIZM5K
+GorpL7PSB8mwVlDl18TpMm3P7nz6YkJYte+HdjO7pg59H39Uvtg3tZnIrFxNxVNb
+YF62/yHfk2AyTgjQZQUSmDS84jq1zUK4oS90lxr+u8qwELTniMs=
+-----END RSA PRIVATE KEY-----
diff --git a/test/test_headers/test_http.yml b/test/test_headers/test_http.yml
index fa5984028..41d0c309b 100644
--- a/test/test_headers/test_http.yml
+++ b/test/test_headers/test_http.yml
@@ -1,12 +1,10 @@
-version: "2"
-
 services:
   web:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: web.nginx-proxy.tld
 
   web-server-tokens-off:
@@ -14,11 +12,6 @@ services:
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: web-server-tokens-off.nginx-proxy.tld
       SERVER_TOKENS: "off"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_headers/test_https.yml b/test/test_headers/test_https.yml
index 0300d4386..d3a96c6b1 100644
--- a/test/test_headers/test_https.yml
+++ b/test/test_headers/test_https.yml
@@ -1,12 +1,15 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/certs:/etc/nginx/certs:ro
+
   web:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: web.nginx-proxy.tld
 
   web-server-tokens-off:
@@ -14,17 +17,6 @@ services:
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: web-server-tokens-off.nginx-proxy.tld
       SERVER_TOKENS: "off"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs/web.nginx-proxy.tld.crt:/etc/nginx/certs/default.crt:ro
-      - ./certs/web.nginx-proxy.tld.key:/etc/nginx/certs/default.key:ro
-      - ./certs/web.nginx-proxy.tld.crt:/etc/nginx/certs/web.nginx-proxy.tld.crt:ro
-      - ./certs/web.nginx-proxy.tld.key:/etc/nginx/certs/web.nginx-proxy.tld.key:ro
-      - ./certs/web-server-tokens-off.nginx-proxy.tld.crt:/etc/nginx/certs/web-server-tokens-off.nginx-proxy.tld.crt:ro
-      - ./certs/web-server-tokens-off.nginx-proxy.tld.key:/etc/nginx/certs/web-server-tokens-off.nginx-proxy.tld.key:ro
diff --git a/test/test_host-network-mode/test_host-network-mode.py b/test/test_host-network-mode/test_host-network-mode.py
index 0c2134810..c80fbf0d4 100644
--- a/test/test_host-network-mode/test_host-network-mode.py
+++ b/test/test_host-network-mode/test_host-network-mode.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_forwards_to_bridge_network_container(docker_compose, nginxproxy):
     r = nginxproxy.get("http://bridge-network.nginx-proxy.tld/port")
     assert r.status_code == 200   
diff --git a/test/test_host-network-mode/test_host-network-mode.yml b/test/test_host-network-mode/test_host-network-mode.yml
index 1f2769c7d..452c73c74 100644
--- a/test/test_host-network-mode/test_host-network-mode.yml
+++ b/test/test_host-network-mode/test_host-network-mode.yml
@@ -1,11 +1,14 @@
-version: "2"
-
 networks:
   net1:
     internal: true
   net2:
 
 services:
+  nginx-proxy:
+    networks:
+      - net1
+      - net2
+
   bridge-network:
     image: web
     environment:
@@ -21,11 +24,3 @@ services:
       VIRTUAL_HOST: "host-network.nginx-proxy.tld"
       VIRTUAL_PORT: "8080"
     network_mode: host
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    networks:
-      - net1
-      - net2
diff --git a/test/test_host-network-mode/test_proxy-host-network-mode.py b/test/test_host-network-mode/test_proxy-host-network-mode.py
index 330334b8b..fd7208e60 100644
--- a/test/test_host-network-mode/test_proxy-host-network-mode.py
+++ b/test/test_host-network-mode/test_proxy-host-network-mode.py
@@ -1,5 +1,5 @@
-import pytest
-
+# Note: on Docker Desktop, host networking must be manually enabled.
+# See https://docs.docker.com/engine/network/drivers/host/
 
 def test_forwards_to_host_network_container_1(docker_compose, nginxproxy):
     r = nginxproxy.get("http://host-network-1.nginx-proxy.tld:8888/port")
diff --git a/test/test_host-network-mode/test_proxy-host-network-mode.yml b/test/test_host-network-mode/test_proxy-host-network-mode.yml
index 32106e2eb..283dcf5d6 100644
--- a/test/test_host-network-mode/test_proxy-host-network-mode.yml
+++ b/test/test_host-network-mode/test_proxy-host-network-mode.yml
@@ -1,6 +1,9 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      HTTP_PORT: 8888
+    network_mode: host
+
   host-network-1:
     image: web
     environment:
@@ -16,11 +19,3 @@ services:
       VIRTUAL_HOST: "host-network-2.nginx-proxy.tld"
       VIRTUAL_PORT: "8181"
     network_mode: host
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      HTTP_PORT: 8888
-    network_mode: host
diff --git a/test/test_htpasswd/compose.base.override.yml b/test/test_htpasswd/compose.base.override.yml
new file mode 100644
index 000000000..f289bd3b8
--- /dev/null
+++ b/test/test_htpasswd/compose.base.override.yml
@@ -0,0 +1,5 @@
+services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/htpasswd:/etc/nginx/htpasswd:ro
diff --git a/test/test_htpasswd/test_htpasswd_regex_virtual_host.py b/test/test_htpasswd/test_htpasswd-regex-virtual-host.py
similarity index 97%
rename from test/test_htpasswd/test_htpasswd_regex_virtual_host.py
rename to test/test_htpasswd/test_htpasswd-regex-virtual-host.py
index 1b169d001..b82055f62 100644
--- a/test/test_htpasswd/test_htpasswd_regex_virtual_host.py
+++ b/test/test_htpasswd/test_htpasswd-regex-virtual-host.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_htpasswd_regex_virtual_host_is_restricted(docker_compose, nginxproxy):
     r = nginxproxy.get("http://regex.htpasswd.nginx-proxy.example/port")
     assert r.status_code == 401
diff --git a/test/test_htpasswd/test_htpasswd-regex-virtual-host.yml b/test/test_htpasswd/test_htpasswd-regex-virtual-host.yml
new file mode 100644
index 000000000..b47236af8
--- /dev/null
+++ b/test/test_htpasswd/test_htpasswd-regex-virtual-host.yml
@@ -0,0 +1,8 @@
+services:
+  regex:
+    image: web
+    expose:
+      - "80"
+    environment:
+      WEB_PORTS: "80"
+      VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$
diff --git a/test/test_htpasswd/test_htpasswd_virtual_host.py b/test/test_htpasswd/test_htpasswd-virtual-host.py
similarity index 97%
rename from test/test_htpasswd/test_htpasswd_virtual_host.py
rename to test/test_htpasswd/test_htpasswd-virtual-host.py
index aff3a62ad..cfb9934cc 100644
--- a/test/test_htpasswd/test_htpasswd_virtual_host.py
+++ b/test/test_htpasswd/test_htpasswd-virtual-host.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_htpasswd_virtual_host_is_restricted(docker_compose, nginxproxy):
     r = nginxproxy.get("http://htpasswd.nginx-proxy.tld/port")
     assert r.status_code == 401
diff --git a/test/test_htpasswd/test_htpasswd-virtual-host.yml b/test/test_htpasswd/test_htpasswd-virtual-host.yml
new file mode 100644
index 000000000..952d1dd20
--- /dev/null
+++ b/test/test_htpasswd/test_htpasswd-virtual-host.yml
@@ -0,0 +1,8 @@
+services:
+  web:
+    image: web
+    expose:
+      - "80"
+    environment:
+      WEB_PORTS: "80"
+      VIRTUAL_HOST: htpasswd.nginx-proxy.tld
diff --git a/test/test_htpasswd/test_htpasswd_virtual_path.py b/test/test_htpasswd/test_htpasswd-virtual-path.py
similarity index 97%
rename from test/test_htpasswd/test_htpasswd_virtual_path.py
rename to test/test_htpasswd/test_htpasswd-virtual-path.py
index 262b31472..da5b4fbda 100644
--- a/test/test_htpasswd/test_htpasswd_virtual_path.py
+++ b/test/test_htpasswd/test_htpasswd-virtual-path.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_htpasswd_virtual_path_is_restricted(docker_compose, nginxproxy):
     r = nginxproxy.get("http://htpasswd.nginx-proxy.tld/foo/port")
     assert r.status_code == 401
diff --git a/test/test_htpasswd/test_htpasswd-virtual-path.yml b/test/test_htpasswd/test_htpasswd-virtual-path.yml
new file mode 100644
index 000000000..ad7d79208
--- /dev/null
+++ b/test/test_htpasswd/test_htpasswd-virtual-path.yml
@@ -0,0 +1,10 @@
+services:
+  web:
+    image: web
+    expose:
+      - "80"
+    environment:
+      WEB_PORTS: "80"
+      VIRTUAL_HOST: htpasswd.nginx-proxy.tld
+      VIRTUAL_PATH: /foo/
+      VIRTUAL_DEST: /
diff --git a/test/test_htpasswd/test_htpasswd_regex_virtual_host.yml b/test/test_htpasswd/test_htpasswd_regex_virtual_host.yml
deleted file mode 100644
index 7f0d1bc96..000000000
--- a/test/test_htpasswd/test_htpasswd_regex_virtual_host.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: "2"
-
-services:
-  regex:
-    image: web
-    expose:
-      - "80"
-    environment:
-      WEB_PORTS: 80
-      VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$
-
-  sut:
-    container_name: sut
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./htpasswd:/etc/nginx/htpasswd:ro
diff --git a/test/test_htpasswd/test_htpasswd_virtual_host.yml b/test/test_htpasswd/test_htpasswd_virtual_host.yml
deleted file mode 100644
index b3f15df9e..000000000
--- a/test/test_htpasswd/test_htpasswd_virtual_host.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: "2"
-
-services:
-  web:
-    image: web
-    expose:
-      - "80"
-    environment:
-      WEB_PORTS: 80
-      VIRTUAL_HOST: htpasswd.nginx-proxy.tld
-
-  sut:
-    container_name: sut
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./htpasswd:/etc/nginx/htpasswd:ro
diff --git a/test/test_htpasswd/test_htpasswd_virtual_path.yml b/test/test_htpasswd/test_htpasswd_virtual_path.yml
deleted file mode 100644
index ffe1a0858..000000000
--- a/test/test_htpasswd/test_htpasswd_virtual_path.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "2"
-
-services:
-  web:
-    image: web
-    expose:
-      - "80"
-    environment:
-      WEB_PORTS: 80
-      VIRTUAL_HOST: htpasswd.nginx-proxy.tld
-      VIRTUAL_PATH: /foo/
-      VIRTUAL_DEST: /
-
-  sut:
-    container_name: sut
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./htpasswd:/etc/nginx/htpasswd:ro
diff --git a/test/test_http_port.py b/test/test_http-port/test_http-port.py
similarity index 100%
rename from test/test_http_port.py
rename to test/test_http-port/test_http-port.py
diff --git a/test/test_http_port.yml b/test/test_http-port/test_http-port.yml
similarity index 59%
rename from test/test_http_port.yml
rename to test/test_http-port/test_http-port.yml
index a346982c3..f1203eec0 100644
--- a/test/test_http_port.yml
+++ b/test/test_http-port/test_http-port.yml
@@ -1,6 +1,10 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      HTTP_PORT: 8080
+    ports:
+      - "8080:8080"
+
   web1:
     image: web
     expose:
@@ -8,10 +12,3 @@ services:
     environment:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "*.nginx-proxy.tld"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      HTTP_PORT: 8080
diff --git a/test/test_http2/test_http2_global_disabled.py b/test/test_http2/test_http2-global-disabled.py
similarity index 95%
rename from test/test_http2/test_http2_global_disabled.py
rename to test/test_http2/test_http2-global-disabled.py
index 42e102d12..e09960378 100644
--- a/test/test_http2/test_http2_global_disabled.py
+++ b/test/test_http2/test_http2-global-disabled.py
@@ -1,6 +1,6 @@
-import pytest
 import re
 
+
 def test_http2_global_disabled_config(docker_compose, nginxproxy):
     conf = nginxproxy.get_conf().decode('ASCII')
     r = nginxproxy.get("http://http2-global-disabled.nginx-proxy.tld")
diff --git a/test/test_http2/test_http2_global_disabled.yml b/test/test_http2/test_http2-global-disabled.yml
similarity index 57%
rename from test/test_http2/test_http2_global_disabled.yml
rename to test/test_http2/test_http2-global-disabled.yml
index 8fd3cde63..f37755755 100644
--- a/test/test_http2/test_http2_global_disabled.yml
+++ b/test/test_http2/test_http2-global-disabled.yml
@@ -1,17 +1,12 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      ENABLE_HTTP2: "false"
+
   http2-global-disabled:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: http2-global-disabled.nginx-proxy.tld
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      ENABLE_HTTP2: "false"
diff --git a/test/test_http3/test_http3_global_disabled.py b/test/test_http3/test_http3-global-disabled.py
similarity index 83%
rename from test/test_http3/test_http3_global_disabled.py
rename to test/test_http3/test_http3-global-disabled.py
index 508823e6b..4f9d60a5f 100644
--- a/test/test_http3/test_http3_global_disabled.py
+++ b/test/test_http3/test_http3-global-disabled.py
@@ -1,8 +1,8 @@
-import pytest
 import re
 
-    #Python Requests is not able to do native http3 requests. 
-    #We only check for directives which should enable http3.
+
+# Python Requests is not able to do native http3 requests.
+# We only check for directives which should enable http3.
 
 def test_http3_global_disabled_ALTSVC_header(docker_compose, nginxproxy):
     r = nginxproxy.get("http://http3-global-disabled.nginx-proxy.tld/headers")
diff --git a/test/test_http3/test_http3-global-disabled.yml b/test/test_http3/test_http3-global-disabled.yml
new file mode 100644
index 000000000..9b49841b2
--- /dev/null
+++ b/test/test_http3/test_http3-global-disabled.yml
@@ -0,0 +1,12 @@
+services:
+#  nginx-proxy:
+#    environment:
+#      ENABLE_HTTP3: "false"    #Disabled by default
+
+  http3-global-disabled:
+    image: web
+    expose:
+      - "80"
+    environment:
+      WEB_PORTS: "80"
+      VIRTUAL_HOST: http3-global-disabled.nginx-proxy.tld
diff --git a/test/test_http3/test_http3_global_enabled.py b/test/test_http3/test_http3-global-enabled.py
similarity index 87%
rename from test/test_http3/test_http3_global_enabled.py
rename to test/test_http3/test_http3-global-enabled.py
index c678ab6b5..0efc2e388 100644
--- a/test/test_http3/test_http3_global_enabled.py
+++ b/test/test_http3/test_http3-global-enabled.py
@@ -1,8 +1,8 @@
-import pytest
 import re
 
-    #Python Requests is not able to do native http3 requests. 
-    #We only check for directives which should enable http3.
+
+# Python Requests is not able to do native http3 requests.
+# We only check for directives which should enable http3.
 
 def test_http3_global_enabled_ALTSVC_header(docker_compose, nginxproxy):
     r = nginxproxy.get("http://http3-global-enabled.nginx-proxy.tld/headers")
diff --git a/test/test_http3/test_http3_global_enabled.yml b/test/test_http3/test_http3-global-enabled.yml
similarity index 57%
rename from test/test_http3/test_http3_global_enabled.yml
rename to test/test_http3/test_http3-global-enabled.yml
index 1cd40e0a0..46697c5ac 100644
--- a/test/test_http3/test_http3_global_enabled.yml
+++ b/test/test_http3/test_http3-global-enabled.yml
@@ -1,17 +1,12 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      ENABLE_HTTP3: "true"
+
   http3-global-enabled:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: http3-global-enabled.nginx-proxy.tld
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      ENABLE_HTTP3: "true"
diff --git a/test/test_http3/test_http3_vhost.py b/test/test_http3/test_http3-vhost.py
similarity index 95%
rename from test/test_http3/test_http3_vhost.py
rename to test/test_http3/test_http3-vhost.py
index 93a217cab..85d90d205 100644
--- a/test/test_http3/test_http3_vhost.py
+++ b/test/test_http3/test_http3-vhost.py
@@ -1,8 +1,8 @@
-import pytest
 import re
 
-    #Python Requests is not able to do native http3 requests. 
-    #We only check for directives which should enable http3.
+
+# Python Requests is not able to do native http3 requests.
+# We only check for directives which should enable http3.
 
 def test_http3_vhost_enabled_ALTSVC_header(docker_compose, nginxproxy):
     r = nginxproxy.get("http://http3-vhost-enabled.nginx-proxy.tld/headers")
diff --git a/test/test_http3/test_http3_vhost.yml b/test/test_http3/test_http3-vhost.yml
similarity index 76%
rename from test/test_http3/test_http3_vhost.yml
rename to test/test_http3/test_http3-vhost.yml
index 345bb30e5..afa330e57 100644
--- a/test/test_http3/test_http3_vhost.yml
+++ b/test/test_http3/test_http3-vhost.yml
@@ -1,12 +1,14 @@
-version: "2"
-
 services:
+#  nginx-proxy:
+#    environment:
+#      ENABLE_HTTP3: "false"    #Disabled by default
+
   http3-vhost-enabled:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: http3-vhost-enabled.nginx-proxy.tld
     labels:
       com.github.nginx-proxy.nginx-proxy.http3.enable: "true"
@@ -16,7 +18,7 @@ services:
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: http3-vhost-disabled.nginx-proxy.tld
     labels:
       com.github.nginx-proxy.nginx-proxy.http3.enable: "false"
@@ -26,10 +28,5 @@ services:
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: http3-vhost-default-disabled.nginx-proxy.tld
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_http3/test_http3_global_disabled.yml b/test/test_http3/test_http3_global_disabled.yml
deleted file mode 100644
index 482a5eaea..000000000
--- a/test/test_http3/test_http3_global_disabled.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-version: "2"
-
-services:
-  http3-global-disabled:
-    image: web
-    expose:
-      - "80"
-    environment:
-      WEB_PORTS: 80
-      VIRTUAL_HOST: http3-global-disabled.nginx-proxy.tld
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    #environment:
-    #ENABLE_HTTP3: "false"    #Disabled by default
diff --git a/test/test_internal/compose.base.override.yml b/test/test_internal/compose.base.override.yml
new file mode 100644
index 000000000..c455021e4
--- /dev/null
+++ b/test/test_internal/compose.base.override.yml
@@ -0,0 +1,5 @@
+services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/network_internal.conf:/etc/nginx/network_internal.conf:ro
diff --git a/test/test_internal/test_internal-per-vhost.py b/test/test_internal/test_internal-per-vhost.py
index e64cc62e1..04649e262 100644
--- a/test/test_internal/test_internal-per-vhost.py
+++ b/test/test_internal/test_internal-per-vhost.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_network_web1(docker_compose, nginxproxy):
     r = nginxproxy.get("http://web1.nginx-proxy.example/port")
     assert r.status_code == 200   
diff --git a/test/test_internal/test_internal-per-vhost.yml b/test/test_internal/test_internal-per-vhost.yml
index cc67c2240..3b0399f68 100644
--- a/test/test_internal/test_internal-per-vhost.yml
+++ b/test/test_internal/test_internal-per-vhost.yml
@@ -1,12 +1,10 @@
-version: "2"
-
 services:
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.example
       NETWORK_ACCESS: internal
 
@@ -15,11 +13,5 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.example
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./network_internal.conf:/etc/nginx/network_internal.conf:ro
diff --git a/test/test_internal/test_internal-per-vpath.py b/test/test_internal/test_internal-per-vpath.py
index def806c12..f788fa518 100644
--- a/test/test_internal/test_internal-per-vpath.py
+++ b/test/test_internal/test_internal-per-vpath.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_network_web1(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy.example/web1/port")
     assert r.status_code == 200   
diff --git a/test/test_internal/test_internal-per-vpath.yml b/test/test_internal/test_internal-per-vpath.yml
index 35e92f051..301a756f9 100644
--- a/test/test_internal/test_internal-per-vpath.yml
+++ b/test/test_internal/test_internal-per-vpath.yml
@@ -1,12 +1,10 @@
-version: "2"
-
 services:
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: nginx-proxy.example
       VIRTUAL_PATH: /web1/
       VIRTUAL_DEST: /
@@ -17,13 +15,8 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: nginx-proxy.example
       VIRTUAL_PATH: /web2/
       VIRTUAL_DEST: /
 
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./network_internal.conf:/etc/nginx/network_internal.conf:ro
diff --git a/test/test_ipv6/test_ipv6-prefer-ipv4-network.py b/test/test_ipv6/test_ipv6-prefer-ipv4-network.py
new file mode 100644
index 000000000..f11c797da
--- /dev/null
+++ b/test/test_ipv6/test_ipv6-prefer-ipv4-network.py
@@ -0,0 +1,16 @@
+def test_forwards_to_ipv4_only_network(docker_compose, nginxproxy):
+    r = nginxproxy.get("http://ipv4only.nginx-proxy.tld/port")
+    assert r.status_code == 200   
+    assert r.text == "answer from port 80\n"
+
+
+def test_forwards_to_dualstack_network(docker_compose, nginxproxy):
+    r = nginxproxy.get("http://dualstack.nginx-proxy.tld")
+    assert r.status_code == 200   
+    assert "Welcome to nginx!" in r.text
+
+
+def test_dualstack_network_prefer_ipv4_config(docker_compose, nginxproxy):
+    conf = nginxproxy.get_conf().decode('ASCII')
+    assert "IPv6 address: fd00:cafe:face:feed::2 (ignored; reachable but IPv4 prefered)" in conf
+    assert "server 172.16.20.2:80;" in conf
diff --git a/test/test_ipv6/test_ipv6-prefer-ipv4-network.yml b/test/test_ipv6/test_ipv6-prefer-ipv4-network.yml
new file mode 100644
index 000000000..8691ecf96
--- /dev/null
+++ b/test/test_ipv6/test_ipv6-prefer-ipv4-network.yml
@@ -0,0 +1,41 @@
+networks:
+  ipv4net:
+    ipam:
+      config:
+        - subnet: 172.16.10.0/24
+  dualstacknet:
+    enable_ipv6: true
+    ipam:
+      config:
+        - subnet: 172.16.20.0/24
+        - subnet: fd00:cafe:face:feed::/64
+
+services:
+  nginx-proxy:
+    networks:
+      ipv4net:
+        ipv4_address: 172.16.10.3
+      dualstacknet:
+        ipv4_address: 172.16.20.3
+        ipv6_address: fd00:cafe:face:feed::3
+
+  ipv4only:
+    image: web
+    expose:
+      - "80"
+    environment:
+      WEB_PORTS: "80"
+      VIRTUAL_HOST: ipv4only.nginx-proxy.tld
+    networks:
+      ipv4net:
+        ipv4_address: 172.16.10.2
+
+  dualstack:
+    image: nginx:alpine
+    environment:
+      VIRTUAL_HOST: dualstack.nginx-proxy.tld
+    networks:
+      dualstacknet:
+        ipv4_address: 172.16.20.2
+        ipv6_address: fd00:cafe:face:feed::2
+
diff --git a/test/test_ipv6/test_ipv6-prefer-ipv6-network.py b/test/test_ipv6/test_ipv6-prefer-ipv6-network.py
new file mode 100644
index 000000000..3e1988d6b
--- /dev/null
+++ b/test/test_ipv6/test_ipv6-prefer-ipv6-network.py
@@ -0,0 +1,16 @@
+def test_forwards_to_ipv4_only_network(docker_compose, nginxproxy):
+    r = nginxproxy.get("http://ipv4only.nginx-proxy.tld/port")
+    assert r.status_code == 200   
+    assert r.text == "answer from port 80\n"
+
+
+def test_forwards_to_dualstack_network(docker_compose, nginxproxy):
+    r = nginxproxy.get("http://dualstack.nginx-proxy.tld")
+    assert r.status_code == 200   
+    assert "Welcome to nginx!" in r.text
+
+
+def test_dualstack_network_prefer_ipv6_config(docker_compose, nginxproxy):
+    conf = nginxproxy.get_conf().decode('ASCII')
+    assert "IPv4 address: 172.16.20.2 (ignored; reachable but IPv6 prefered)" in conf
+    assert "server [fd00:cafe:face:feed::2]:80;" in conf
diff --git a/test/test_ipv6/test_ipv6-prefer-ipv6-network.yml b/test/test_ipv6/test_ipv6-prefer-ipv6-network.yml
new file mode 100644
index 000000000..54925be24
--- /dev/null
+++ b/test/test_ipv6/test_ipv6-prefer-ipv6-network.yml
@@ -0,0 +1,43 @@
+networks:
+  ipv4net:
+    ipam:
+      config:
+        - subnet: 172.16.10.0/24
+  dualstacknet:
+    enable_ipv6: true
+    ipam:
+      config:
+        - subnet: 172.16.20.0/24
+        - subnet: fd00:cafe:face:feed::/64
+
+services:
+  nginx-proxy:
+    environment:
+      PREFER_IPV6_NETWORK: "true"
+    networks:
+      ipv4net:
+        ipv4_address: 172.16.10.3
+      dualstacknet:
+        ipv4_address: 172.16.20.3
+        ipv6_address: fd00:cafe:face:feed::3
+
+  ipv4only:
+    image: web
+    expose:
+      - "80"
+    environment:
+      WEB_PORTS: "80"
+      VIRTUAL_HOST: ipv4only.nginx-proxy.tld
+    networks:
+      ipv4net:
+        ipv4_address: 172.16.10.2
+
+  dualstack:
+    image: nginx:alpine
+    environment:
+      VIRTUAL_HOST: dualstack.nginx-proxy.tld
+    networks:
+      dualstacknet:
+        ipv4_address: 172.16.20.2
+        ipv6_address: fd00:cafe:face:feed::2
+
diff --git a/test/test_ipv6.py b/test/test_ipv6/test_ipv6.py
similarity index 86%
rename from test/test_ipv6.py
rename to test/test_ipv6/test_ipv6.py
index 36bf653af..914dd4eb4 100644
--- a/test/test_ipv6.py
+++ b/test/test_ipv6/test_ipv6.py
@@ -1,5 +1,12 @@
+import platform
+
 import pytest
 
+pytestmark = pytest.mark.skipif(
+    platform.system() == "Darwin",
+    reason="Those tests rely entirely on being able to directly contact the container's IP"
+)
+
 
 def test_unknown_virtual_host_ipv4(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy/port")
diff --git a/test/test_ipv6.yml b/test/test_ipv6/test_ipv6.yml
similarity index 73%
rename from test/test_ipv6.yml
rename to test/test_ipv6/test_ipv6.yml
index d5fec9b40..b391ff5a9 100644
--- a/test/test_ipv6.yml
+++ b/test/test_ipv6/test_ipv6.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   net1:
     enable_ipv6: true
@@ -8,12 +6,18 @@ networks:
         - subnet: fd00:1::/80
 
 services:
+  nginx-proxy:
+    environment:
+      ENABLE_IPV6: "true"
+    networks:
+      - net1
+
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.tld
     networks:
       - net1
@@ -23,16 +27,8 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.tld
     networks:
       - net1
 
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      ENABLE_IPV6: "true"
-    networks:
-      - net1
diff --git a/test/test_keepalive.py b/test/test_keepalive/test_keepalive.py
similarity index 100%
rename from test/test_keepalive.py
rename to test/test_keepalive/test_keepalive.py
diff --git a/test/test_keepalive.yml b/test/test_keepalive/test_keepalive.yml
similarity index 70%
rename from test/test_keepalive.yml
rename to test/test_keepalive/test_keepalive.yml
index 6da66f0b3..3ec3f1e17 100644
--- a/test/test_keepalive.yml
+++ b/test/test_keepalive/test_keepalive.yml
@@ -1,24 +1,28 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      HTTPS_METHOD: nohttps
+
   keepalive-disabled:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: keepalive-disabled.nginx-proxy.test
+    labels:
+      com.github.nginx-proxy.nginx-proxy.keepalive: "disabled"
 
   keepalive-enabled:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: keepalive-enabled.nginx-proxy.test
     labels:
       com.github.nginx-proxy.nginx-proxy.keepalive: "64"
-  
+
   keepalive-auto:
     image: web
     deploy:
@@ -27,14 +31,6 @@ services:
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: keepalive-auto.nginx-proxy.test
-    labels:
-      com.github.nginx-proxy.nginx-proxy.keepalive: "auto"
 
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      HTTPS_METHOD: nohttps
diff --git a/test/test_loadbalancing.py b/test/test_loadbalancing/test_loadbalancing.py
similarity index 95%
rename from test/test_loadbalancing.py
rename to test/test_loadbalancing/test_loadbalancing.py
index 4b43aa525..08f853775 100644
--- a/test/test_loadbalancing.py
+++ b/test/test_loadbalancing/test_loadbalancing.py
@@ -1,16 +1,16 @@
-import pytest
-import re
-
-def test_loadbalance_hash(docker_compose, nginxproxy):
-    conf = nginxproxy.get_conf().decode('ASCII')
-    r1 = nginxproxy.get("http://loadbalance-enabled.nginx-proxy.tld")
-    r2 = nginxproxy.get("http://loadbalance-enabled.nginx-proxy.tld")
-    assert re.search(r"hash \$remote_addr\;", conf)
-    assert r1.status_code == 200
-    assert r2.text == r1.text
-
-def test_loadbalance_roundrobin(docker_compose, nginxproxy):
-    r1 = nginxproxy.get("http://loadbalance-disabled.nginx-proxy.tld")
-    r2 = nginxproxy.get("http://loadbalance-disabled.nginx-proxy.tld")
-    assert r1.status_code == 200
-    assert r2.text != r1.text
+import re
+
+
+def test_loadbalance_hash(docker_compose, nginxproxy):
+    conf = nginxproxy.get_conf().decode('ASCII')
+    r1 = nginxproxy.get("http://loadbalance-enabled.nginx-proxy.tld")
+    r2 = nginxproxy.get("http://loadbalance-enabled.nginx-proxy.tld")
+    assert re.search(r"hash \$remote_addr\;", conf)
+    assert r1.status_code == 200
+    assert r2.text == r1.text
+
+def test_loadbalance_roundrobin(docker_compose, nginxproxy):
+    r1 = nginxproxy.get("http://loadbalance-disabled.nginx-proxy.tld")
+    r2 = nginxproxy.get("http://loadbalance-disabled.nginx-proxy.tld")
+    assert r1.status_code == 200
+    assert r2.text != r1.text
diff --git a/test/test_loadbalancing.yml b/test/test_loadbalancing/test_loadbalancing.yml
similarity index 69%
rename from test/test_loadbalancing.yml
rename to test/test_loadbalancing/test_loadbalancing.yml
index 72155fb11..1ffec1f54 100644
--- a/test/test_loadbalancing.yml
+++ b/test/test_loadbalancing/test_loadbalancing.yml
@@ -1,29 +1,22 @@
-version: "2"
-
-services:
-  loadbalance-hash:
-    image: web
-    expose:
-      - "81"
-    environment:
-      WEB_PORTS: 81
-      VIRTUAL_HOST: loadbalance-enabled.nginx-proxy.tld
-    labels:
-      com.github.nginx-proxy.nginx-proxy.loadbalance: "hash $$remote_addr;"
-    deploy:
-      replicas: 2
-
-  loadbalance-roundrobin:
-    image: web
-    expose:
-      - "82"
-    environment:
-      WEB_PORTS: 82
-      VIRTUAL_HOST: loadbalance-disabled.nginx-proxy.tld
-    deploy:
-      replicas: 2
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
+services:
+  loadbalance-hash:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: loadbalance-enabled.nginx-proxy.tld
+    labels:
+      com.github.nginx-proxy.nginx-proxy.loadbalance: "hash $$remote_addr;"
+    deploy:
+      replicas: 2
+
+  loadbalance-roundrobin:
+    image: web
+    expose:
+      - "82"
+    environment:
+      WEB_PORTS: "82"
+      VIRTUAL_HOST: loadbalance-disabled.nginx-proxy.tld
+    deploy:
+      replicas: 2
diff --git a/test/test_location-override.py b/test/test_location-override/test_location-override.py
similarity index 100%
rename from test/test_location-override.py
rename to test/test_location-override/test_location-override.py
diff --git a/test/test_location-override.yml b/test/test_location-override/test_location-override.yml
similarity index 89%
rename from test/test_location-override.yml
rename to test/test_location-override/test_location-override.yml
index 9ba4eb82b..00bac6fce 100644
--- a/test/test_location-override.yml
+++ b/test/test_location-override/test_location-override.yml
@@ -1,11 +1,8 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
+  nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./test_location-override.vhost.d:/etc/nginx/vhost.d:ro
+      - ${PYTEST_MODULE_PATH}/vhost.d:/etc/nginx/vhost.d:ro
 
   explicit-root:
     image: web
diff --git a/test/test_location-override.vhost.d/explicit-nonroot.nginx-proxy.test_8d960560c82f4e6c8b1b0f03eb30a1afd00e5696_location_override b/test/test_location-override/vhost.d/explicit-nonroot.nginx-proxy.test_8d960560c82f4e6c8b1b0f03eb30a1afd00e5696_location_override
similarity index 100%
rename from test/test_location-override.vhost.d/explicit-nonroot.nginx-proxy.test_8d960560c82f4e6c8b1b0f03eb30a1afd00e5696_location_override
rename to test/test_location-override/vhost.d/explicit-nonroot.nginx-proxy.test_8d960560c82f4e6c8b1b0f03eb30a1afd00e5696_location_override
diff --git a/test/test_location-override.vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override b/test/test_location-override/vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
similarity index 100%
rename from test/test_location-override.vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
rename to test/test_location-override/vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
diff --git a/test/test_location-override.vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_location_override b/test/test_location-override/vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_location_override
similarity index 100%
rename from test/test_location-override.vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_location_override
rename to test/test_location-override/vhost.d/explicit-root-hash-and-nohash.nginx-proxy.test_location_override
diff --git a/test/test_location-override.vhost.d/explicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override b/test/test_location-override/vhost.d/explicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
similarity index 100%
rename from test/test_location-override.vhost.d/explicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
rename to test/test_location-override/vhost.d/explicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
diff --git a/test/test_location-override.vhost.d/explicit-root-nohash.nginx-proxy.test_location_override b/test/test_location-override/vhost.d/explicit-root-nohash.nginx-proxy.test_location_override
similarity index 100%
rename from test/test_location-override.vhost.d/explicit-root-nohash.nginx-proxy.test_location_override
rename to test/test_location-override/vhost.d/explicit-root-nohash.nginx-proxy.test_location_override
diff --git a/test/test_location-override.vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override b/test/test_location-override/vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
similarity index 100%
rename from test/test_location-override.vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
rename to test/test_location-override/vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
diff --git a/test/test_location-override.vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_location_override b/test/test_location-override/vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_location_override
similarity index 100%
rename from test/test_location-override.vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_location_override
rename to test/test_location-override/vhost.d/implicit-root-hash-and-nohash.nginx-proxy.test_location_override
diff --git a/test/test_location-override.vhost.d/implicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override b/test/test_location-override/vhost.d/implicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
similarity index 100%
rename from test/test_location-override.vhost.d/implicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
rename to test/test_location-override/vhost.d/implicit-root-hash.nginx-proxy.test_42099b4af021e53fd8fd4e056c2568d7c2e3ffa8_location_override
diff --git a/test/test_location-override.vhost.d/implicit-root-nohash.nginx-proxy.test_location_override b/test/test_location-override/vhost.d/implicit-root-nohash.nginx-proxy.test_location_override
similarity index 100%
rename from test/test_location-override.vhost.d/implicit-root-nohash.nginx-proxy.test_location_override
rename to test/test_location-override/vhost.d/implicit-root-nohash.nginx-proxy.test_location_override
diff --git a/test/test_logs/test_log_disabled.py b/test/test_logs/test_log-disabled.py
similarity index 86%
rename from test/test_logs/test_log_disabled.py
rename to test/test_logs/test_log-disabled.py
index 2870b9057..ce0782d00 100644
--- a/test/test_logs/test_log_disabled.py
+++ b/test/test_logs/test_log-disabled.py
@@ -1,10 +1,8 @@
-import pytest
-
 def test_log_disabled(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy.test/port")
     assert r.status_code == 200
     assert r.text == "answer from port 81\n"
-    sut_container = docker_compose.containers.get("sut")
+    sut_container = docker_compose.containers.get("nginx-proxy")
     docker_logs = sut_container.logs(stdout=True, stderr=True, stream=False, follow=False)
     docker_logs = docker_logs.decode("utf-8").splitlines()
     docker_logs = [line for line in docker_logs if "GET /port" in line]
diff --git a/test/test_logs/test_log-disabled.yml b/test/test_logs/test_log-disabled.yml
new file mode 100644
index 000000000..9e116d749
--- /dev/null
+++ b/test/test_logs/test_log-disabled.yml
@@ -0,0 +1,12 @@
+services:
+  nginx-proxy:
+    environment:
+      DISABLE_ACCESS_LOGS: true
+
+  web1:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: nginx-proxy.test
diff --git a/test/test_logs/test_log_format.py b/test/test_logs/test_log-format.py
similarity index 86%
rename from test/test_logs/test_log_format.py
rename to test/test_logs/test_log-format.py
index 589f0c70b..f65b11e6f 100644
--- a/test/test_logs/test_log_format.py
+++ b/test/test_logs/test_log-format.py
@@ -1,10 +1,8 @@
-import pytest
-
 def test_log_format(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy.test/port")
     assert r.status_code == 200
     assert r.text == "answer from port 81\n"
-    sut_container = docker_compose.containers.get("sut")
+    sut_container = docker_compose.containers.get("nginx-proxy")
     docker_logs = sut_container.logs(stdout=True, stderr=True, stream=False, follow=False)
     docker_logs = docker_logs.decode("utf-8").splitlines()
     docker_logs = [line for line in docker_logs if "GET /port" in line]
diff --git a/test/test_logs/test_log_format.yml b/test/test_logs/test_log-format.yml
similarity index 66%
rename from test/test_logs/test_log_format.yml
rename to test/test_logs/test_log-format.yml
index 2a32e3d00..fba270cb1 100644
--- a/test/test_logs/test_log_format.yml
+++ b/test/test_logs/test_log-format.yml
@@ -1,18 +1,12 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      LOG_FORMAT: '$$remote_addr - $$remote_user [$$time_local] "$$request" $$status $$body_bytes_sent "$$http_referer" "$$http_user_agent" request_time=$$request_time $$upstream_response_time'
+
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: nginx-proxy.test
-
-  sut:
-    container_name: sut
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      LOG_FORMAT: '$$remote_addr - $$remote_user [$$time_local] "$$request" $$status $$body_bytes_sent "$$http_referer" "$$http_user_agent" request_time=$$request_time $$upstream_response_time'
diff --git a/test/test_logs/test_log_json_format.py b/test/test_logs/test_log-json-format.py
similarity index 90%
rename from test/test_logs/test_log_json_format.py
rename to test/test_logs/test_log-json-format.py
index 2d158cb7c..dd473f706 100644
--- a/test/test_logs/test_log_json_format.py
+++ b/test/test_logs/test_log-json-format.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_log_json_format(docker_compose, nginxproxy):
     log_conf = [line for line in nginxproxy.get_conf().decode('ASCII').splitlines() if "log_format vhost escape=" in line]
     assert "{\"time_local\":\"$time_iso8601\"," in log_conf[0]
@@ -7,7 +5,7 @@ def test_log_json_format(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy.test/port")
     assert r.status_code == 200
     assert r.text == "answer from port 81\n"
-    sut_container = docker_compose.containers.get("sut")
+    sut_container = docker_compose.containers.get("nginx-proxy")
     docker_logs = sut_container.logs(stdout=True, stderr=True, stream=False, follow=False)
     docker_logs = docker_logs.decode("utf-8").splitlines()
     docker_logs = [line for line in docker_logs if "{\"time_local\":" in line]
diff --git a/test/test_logs/test_log_json_format.yml b/test/test_logs/test_log-json-format.yml
similarity index 61%
rename from test/test_logs/test_log_json_format.yml
rename to test/test_logs/test_log-json-format.yml
index 5e01e924f..f0c887882 100644
--- a/test/test_logs/test_log_json_format.yml
+++ b/test/test_logs/test_log-json-format.yml
@@ -1,18 +1,12 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      LOG_FORMAT: '{"time_local":"$$time_iso8601","remote_addr":"$$remote_addr","request":"$$request","upstream_addr":"$$upstream_addr"}'
+
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: nginx-proxy.test
-
-  sut:
-    container_name: sut
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      LOG_FORMAT: '{"time_local":"$$time_iso8601","remote_addr":"$$remote_addr","request":"$$request","upstream_addr":"$$upstream_addr"}'
diff --git a/test/test_logs/test_log_json.py b/test/test_logs/test_log-json.py
similarity index 89%
rename from test/test_logs/test_log_json.py
rename to test/test_logs/test_log-json.py
index 1a04b228c..7931623b2 100644
--- a/test/test_logs/test_log_json.py
+++ b/test/test_logs/test_log-json.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_log_json(docker_compose, nginxproxy):
     log_conf = [line for line in nginxproxy.get_conf().decode('ASCII').splitlines() if "log_format vhost escape=" in line]
     assert "{\"time_local\":\"$time_iso8601\"," in log_conf[0]
@@ -7,7 +5,7 @@ def test_log_json(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy.test/port")
     assert r.status_code == 200
     assert r.text == "answer from port 81\n"
-    sut_container = docker_compose.containers.get("sut")
+    sut_container = docker_compose.containers.get("nginx-proxy")
     docker_logs = sut_container.logs(stdout=True, stderr=True, stream=False, follow=False)
     docker_logs = docker_logs.decode("utf-8").splitlines()
     docker_logs = [line for line in docker_logs if "{\"time_local\":" in line]
diff --git a/test/test_logs/test_log-json.yml b/test/test_logs/test_log-json.yml
new file mode 100644
index 000000000..db48b53ed
--- /dev/null
+++ b/test/test_logs/test_log-json.yml
@@ -0,0 +1,12 @@
+services:
+  nginx-proxy:
+    environment:
+      LOG_JSON: 1
+
+  web1:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: nginx-proxy.test
diff --git a/test/test_logs/test_log_disabled.yml b/test/test_logs/test_log_disabled.yml
deleted file mode 100644
index 2d8a59c91..000000000
--- a/test/test_logs/test_log_disabled.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "2"
-
-services:
-  web1:
-    image: web
-    expose:
-      - "81"
-    environment:
-      WEB_PORTS: 81
-      VIRTUAL_HOST: nginx-proxy.test
-
-  sut:
-    container_name: sut
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      DISABLE_ACCESS_LOGS: true
diff --git a/test/test_logs/test_log_json.yml b/test/test_logs/test_log_json.yml
deleted file mode 100644
index 2e6fefdba..000000000
--- a/test/test_logs/test_log_json.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "2"
-
-services:
-  web1:
-    image: web
-    expose:
-      - "81"
-    environment:
-      WEB_PORTS: 81
-      VIRTUAL_HOST: nginx-proxy.test
-
-  sut:
-    container_name: sut
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      LOG_JSON: 1
diff --git a/test/test_multiple-hosts.yml b/test/test_multiple-hosts.yml
deleted file mode 100644
index 832aac4cf..000000000
--- a/test/test_multiple-hosts.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: "2"
-
-services:
-  web:
-    image: web
-    expose:
-      - "81"
-    environment:
-      WEB_PORTS: 81
-      VIRTUAL_HOST: webA.nginx-proxy.tld,webB.nginx-proxy.tld
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_multiple-hosts.py b/test/test_multiple-hosts/test_multiple-hosts.py
similarity index 97%
rename from test/test_multiple-hosts.py
rename to test/test_multiple-hosts/test_multiple-hosts.py
index 76e7de67c..211930ccb 100644
--- a/test/test_multiple-hosts.py
+++ b/test/test_multiple-hosts/test_multiple-hosts.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_unknown_virtual_host_is_503(docker_compose, nginxproxy):
     r = nginxproxy.get("http://unknown.nginx-proxy.tld/port")
     assert r.status_code == 503
diff --git a/test/test_multiple-hosts/test_multiple-hosts.yml b/test/test_multiple-hosts/test_multiple-hosts.yml
new file mode 100644
index 000000000..c726bb45d
--- /dev/null
+++ b/test/test_multiple-hosts/test_multiple-hosts.yml
@@ -0,0 +1,8 @@
+services:
+  web:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: webA.nginx-proxy.tld,webB.nginx-proxy.tld
diff --git a/test/test_multiple-networks.py b/test/test_multiple-networks/test_multiple-networks.py
similarity index 86%
rename from test/test_multiple-networks.py
rename to test/test_multiple-networks/test_multiple-networks.py
index 9d48cbea5..daf2b0f46 100644
--- a/test/test_multiple-networks.py
+++ b/test/test_multiple-networks/test_multiple-networks.py
@@ -1,7 +1,5 @@
 import re
 
-import pytest
-
 
 def test_unknown_virtual_host(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy/")
@@ -23,6 +21,5 @@ def test_multipath(docker_compose, nginxproxy):
     assert r.text == "answer from port 83\n"
     cfg = nginxproxy.get_conf().decode()
     lines = cfg.splitlines()
-    web3_server_lines = [l for l in lines
-                         if re.search(r'(?m)^\s*server\s+[^\s]*:83;\s*$', l)]
+    web3_server_lines = [l for l in lines if re.search(r'(?m)^\s*server\s+\S*:83;\s*$', l)]
     assert len(web3_server_lines) == 1
diff --git a/test/test_multiple-networks.yml b/test/test_multiple-networks/test_multiple-networks.yml
similarity index 70%
rename from test/test_multiple-networks.yml
rename to test/test_multiple-networks/test_multiple-networks.yml
index 3e34b481e..d522ed552 100644
--- a/test/test_multiple-networks.yml
+++ b/test/test_multiple-networks/test_multiple-networks.yml
@@ -1,16 +1,11 @@
-version: "2"
-
 networks:
-  net1: {}
-  net2: {}
-  net3a: {}
-  net3b: {}
+  net1:
+  net2:
+  net3a:
+  net3b:
 
 services:
   nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
     networks:
       - net1
       - net2
@@ -22,7 +17,7 @@ services:
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.example
     networks:
       - net1
@@ -32,7 +27,7 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.example
     networks:
       - net2
@@ -42,7 +37,7 @@ services:
     expose:
       - "83"
     environment:
-      WEB_PORTS: 83
+      WEB_PORTS: "83"
       VIRTUAL_HOST: web3.nginx-proxy.test
     networks:
       - net3a
diff --git a/test/test_multiports/test_multiports-base-json.py b/test/test_multiports/test_multiports-base-json.py
index 7f1ef0fb0..cab5df86f 100644
--- a/test/test_multiports/test_multiports-base-json.py
+++ b/test/test_multiports/test_multiports-base-json.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_virtual_host_is_dropped_when_using_multiports(docker_compose, nginxproxy):
     r = nginxproxy.get("http://notskipped.nginx-proxy.tld/port")
     assert r.status_code == 200
diff --git a/test/test_multiports/test_multiports-base-json.yml b/test/test_multiports/test_multiports-base-json.yml
index fc0d0fa81..cf9bcbbc6 100644
--- a/test/test_multiports/test_multiports-base-json.yml
+++ b/test/test_multiports/test_multiports-base-json.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   skipvirtualhost:
     image: web
@@ -70,8 +68,3 @@ services:
             }
           }
         }
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_multiports/test_multiports-base-yaml.py b/test/test_multiports/test_multiports-base-yaml.py
index 7f1ef0fb0..cab5df86f 100644
--- a/test/test_multiports/test_multiports-base-yaml.py
+++ b/test/test_multiports/test_multiports-base-yaml.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_virtual_host_is_dropped_when_using_multiports(docker_compose, nginxproxy):
     r = nginxproxy.get("http://notskipped.nginx-proxy.tld/port")
     assert r.status_code == 200
diff --git a/test/test_multiports/test_multiports-base-yaml.yml b/test/test_multiports/test_multiports-base-yaml.yml
index 8bd58030c..56c02aa8c 100644
--- a/test/test_multiports/test_multiports-base-yaml.yml
+++ b/test/test_multiports/test_multiports-base-yaml.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   skipvirtualhost:
     image: web
@@ -54,8 +52,3 @@ services:
           "/customdest":
             port: 10002
             dest: "/port"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_multiports/test_multiports-invalid-syntax.py b/test/test_multiports/test_multiports-invalid-syntax.py
index ed1c77338..ceb7436a8 100644
--- a/test/test_multiports/test_multiports-invalid-syntax.py
+++ b/test/test_multiports/test_multiports-invalid-syntax.py
@@ -1,4 +1,3 @@
-import pytest
 import re
 
 
diff --git a/test/test_multiports/test_multiports-invalid-syntax.yml b/test/test_multiports/test_multiports-invalid-syntax.yml
index 9f4022061..7dd7e9658 100644
--- a/test/test_multiports/test_multiports-invalid-syntax.yml
+++ b/test/test_multiports/test_multiports-invalid-syntax.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   invalidsyntax:
     image: web
@@ -37,8 +35,3 @@ services:
             port: 8080
           "/":
             port: 9000
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_multiports/test_multiports-merge.py b/test/test_multiports/test_multiports-merge.py
index f5aa69782..ff423a7e0 100644
--- a/test/test_multiports/test_multiports-merge.py
+++ b/test/test_multiports/test_multiports-merge.py
@@ -1,5 +1,4 @@
 import backoff
-import pytest
 
 
 def test_multiports_and_legacy_configs_should_be_merged(docker_compose, nginxproxy):
diff --git a/test/test_multiports/test_multiports-merge.yml b/test/test_multiports/test_multiports-merge.yml
index 5c5cd8bd0..c0506fc46 100644
--- a/test/test_multiports/test_multiports-merge.yml
+++ b/test/test_multiports/test_multiports-merge.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   merged-singleport:
     image: web
@@ -34,8 +32,3 @@ services:
           "/foo":
             port: 9191
             dest: "/"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_nominal.py b/test/test_nominal/test_nominal.py
similarity index 85%
rename from test/test_nominal.py
rename to test/test_nominal/test_nominal.py
index a3f9c87f5..ce8e681d8 100644
--- a/test/test_nominal.py
+++ b/test/test_nominal/test_nominal.py
@@ -1,3 +1,5 @@
+import platform
+
 import pytest
 from requests import ConnectionError
 
@@ -19,6 +21,10 @@ def test_forwards_to_web2(docker_compose, nginxproxy):
     assert r.text == "answer from port 82\n" 
 
 
+@pytest.mark.skipif(
+    platform.system() == "Darwin",
+    reason="This test depends on direct communication with the container's IP"
+)
 def test_ipv6_is_disabled_by_default(docker_compose, nginxproxy):
     with pytest.raises(ConnectionError):
         nginxproxy.get("http://nginx-proxy/port", ipv6=True)
diff --git a/test/test_nominal.yml b/test/test_nominal/test_nominal.yml
similarity index 71%
rename from test/test_nominal.yml
rename to test/test_nominal/test_nominal.yml
index 60678951b..93f9ff03b 100644
--- a/test/test_nominal.yml
+++ b/test/test_nominal/test_nominal.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   net1:
     enable_ipv6: true
@@ -8,12 +6,16 @@ networks:
         - subnet: fd00:1::/80
 
 services:
+  nginx-proxy:
+    networks:
+      - net1
+
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.tld
     networks:
       - net1
@@ -23,14 +25,7 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: web2.nginx-proxy.tld
     networks:
       - net1
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    networks:
-      - net1
diff --git a/test/test_ports/test_default-80.py b/test/test_ports/test_default-80.py
index 74c2f9fd2..67b1a0860 100644
--- a/test/test_ports/test_default-80.py
+++ b/test/test_ports/test_default-80.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_answer_is_served_from_port_80_by_default(docker_compose, nginxproxy):
     r = nginxproxy.get("http://web.nginx-proxy.tld/port")
     assert r.status_code == 200
diff --git a/test/test_ports/test_default-80.yml b/test/test_ports/test_default-80.yml
index 0cfdd7e62..e5531c0c4 100644
--- a/test/test_ports/test_default-80.yml
+++ b/test/test_ports/test_default-80.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web
@@ -9,8 +7,3 @@ services:
     environment:
       WEB_PORTS: "80 81"
       VIRTUAL_HOST: "web.nginx-proxy.tld"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_ports/test_single-port-not-80.py b/test/test_ports/test_single-port-not-80.py
index ee86eca76..771d8356d 100644
--- a/test/test_ports/test_single-port-not-80.py
+++ b/test/test_ports/test_single-port-not-80.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_answer_is_served_from_exposed_port_even_if_not_80(docker_compose, nginxproxy):
     r = nginxproxy.get("http://web.nginx-proxy.tld/port")
     assert r.status_code == 200
diff --git a/test/test_ports/test_single-port-not-80.yml b/test/test_ports/test_single-port-not-80.yml
index eef4e0899..2f6be9bb0 100644
--- a/test/test_ports/test_single-port-not-80.yml
+++ b/test/test_ports/test_single-port-not-80.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web
@@ -8,8 +6,3 @@ services:
     environment:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "web.nginx-proxy.tld"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_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 95%
rename from test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.py
rename to test/test_ports/test_virtual-port-single-different-from-single-port.py
index 4008166e2..b61850a02 100644
--- a/test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.py
+++ b/test/test_ports/test_virtual-port-single-different-from-single-port.py
@@ -1,4 +1,3 @@
-import pytest
 import re
 
 
diff --git a/test/test_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 56%
rename from test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml
rename to test/test_ports/test_virtual-port-single-different-from-single-port.yml
index ba58d4ec1..822b6d444 100644
--- a/test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml
+++ b/test/test_ports/test_virtual-port-single-different-from-single-port.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web
@@ -9,8 +7,3 @@ services:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "web.nginx-proxy.tld"
       VIRTUAL_PORT: "90"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_ports/test_VIRTUAL_PORT.py b/test/test_ports/test_virtual-port.py
similarity index 92%
rename from test/test_ports/test_VIRTUAL_PORT.py
rename to test/test_ports/test_virtual-port.py
index 3c95ba629..9c2d15271 100644
--- a/test/test_ports/test_VIRTUAL_PORT.py
+++ b/test/test_ports/test_virtual-port.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_answer_is_served_from_chosen_port(docker_compose, nginxproxy):
     r = nginxproxy.get("http://web.nginx-proxy.tld/port")
     assert r.status_code == 200
diff --git a/test/test_ports/test_VIRTUAL_PORT.yml b/test/test_ports/test_virtual-port.yml
similarity index 59%
rename from test/test_ports/test_VIRTUAL_PORT.yml
rename to test/test_ports/test_virtual-port.yml
index ab1af4664..4d3ba5f52 100644
--- a/test/test_ports/test_VIRTUAL_PORT.yml
+++ b/test/test_ports/test_virtual-port.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web
@@ -10,8 +8,3 @@ services:
       WEB_PORTS: "80 90"
       VIRTUAL_HOST: "web.nginx-proxy.tld"
       VIRTUAL_PORT: 90
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_raw-ip-vhost.py b/test/test_raw-ip-vhost/test_raw-ip-vhost.py
similarity index 79%
rename from test/test_raw-ip-vhost.py
rename to test/test_raw-ip-vhost/test_raw-ip-vhost.py
index aaff8529a..4708f9ad7 100644
--- a/test/test_raw-ip-vhost.py
+++ b/test/test_raw-ip-vhost/test_raw-ip-vhost.py
@@ -1,15 +1,12 @@
-import pytest
-
-
 def test_raw_ipv4_vhost_forwards_to_web1(docker_compose, nginxproxy):
-    r = nginxproxy.get("http://172.20.0.4")
+    r = nginxproxy.get("http://172.20.0.1")
     assert r.status_code == 200
     web1_container = docker_compose.containers.get("web1")
     assert r.text == f"I'm {web1_container.id[:12]}\n"
 
 
 def test_raw_ipv6_vhost_forwards_to_web2(docker_compose, nginxproxy):
-    r = nginxproxy.get("http://[fd00::4]", ipv6=True)
+    r = nginxproxy.get("http://[fd00::1]")
     assert r.status_code == 200
     web2_container = docker_compose.containers.get("web2")
     assert r.text == f"I'm {web2_container.id[:12]}\n"
diff --git a/test/test_raw-ip-vhost.yml b/test/test_raw-ip-vhost/test_raw-ip-vhost.yml
similarity index 73%
rename from test/test_raw-ip-vhost.yml
rename to test/test_raw-ip-vhost/test_raw-ip-vhost.yml
index f034bdb87..c0b0b02ee 100644
--- a/test/test_raw-ip-vhost.yml
+++ b/test/test_raw-ip-vhost/test_raw-ip-vhost.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   net1:
     enable_ipv6: true
@@ -9,14 +7,22 @@ networks:
         - subnet: fd00::/80
 
 services:
+  nginx-proxy:
+    environment:
+      ENABLE_IPV6: "true"
+    networks:
+      net1:
+        ipv4_address: 172.20.0.4
+        ipv6_address: fd00::4
+
   web1:
     container_name: web1
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
-      VIRTUAL_HOST: "172.20.0.4"
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: "172.20.0.1"
     networks:
       net1:
         ipv4_address: 172.20.0.2
@@ -28,20 +34,10 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 82
-      VIRTUAL_HOST: "[fd00::4]"
+      WEB_PORTS: "82"
+      VIRTUAL_HOST: "[fd00::1]"
     networks:
       net1:
         ipv4_address: 172.20.0.3
         ipv6_address: fd00::3
 
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    environment:
-      ENABLE_IPV6: "true"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    networks:
-      net1:
-        ipv4_address: 172.20.0.4
-        ipv6_address: fd00::4
diff --git a/test/test_server-down/test_load-balancing.py b/test/test_server-down/test_load-balancing.py
index b65d0a16b..6caa9e5ae 100644
--- a/test/test_server-down/test_load-balancing.py
+++ b/test/test_server-down/test_load-balancing.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_web_has_no_server_down(docker_compose, nginxproxy):
     conf = nginxproxy.get_conf().decode('ASCII')
     r = nginxproxy.get("http://web.nginx-proxy.tld/port")
diff --git a/test/test_server-down/test_load-balancing.yml b/test/test_server-down/test_load-balancing.yml
index 232259020..662dd102e 100644
--- a/test/test_server-down/test_load-balancing.yml
+++ b/test/test_server-down/test_load-balancing.yml
@@ -1,12 +1,10 @@
-version: "2"
-
 services:
   web1:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web.nginx-proxy.tld
 
   web2:
@@ -14,7 +12,7 @@ services:
     expose:
       - "82"
     environment:
-      WEB_PORTS: 83
+      WEB_PORTS: "83"
       VIRTUAL_HOST: web.nginx-proxy.tld
 
   web3:
@@ -22,11 +20,6 @@ services:
     expose:
       - "83"
     environment:
-      WEB_PORTS: 83
+      WEB_PORTS: "83"
       VIRTUAL_HOST: web.nginx-proxy.tld
     network_mode: "none"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_server-down/test_no-server-down.py b/test/test_server-down/test_no-server-down.py
index a98ed564c..4fe9b1d93 100644
--- a/test/test_server-down/test_no-server-down.py
+++ b/test/test_server-down/test_no-server-down.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_web_has_no_server_down(docker_compose, nginxproxy):
     conf = nginxproxy.get_conf().decode('ASCII')
     r = nginxproxy.get("http://web.nginx-proxy.tld/port")
diff --git a/test/test_server-down/test_no-server-down.yml b/test/test_server-down/test_no-server-down.yml
index cd7e5acf5..859d8a56e 100644
--- a/test/test_server-down/test_no-server-down.yml
+++ b/test/test_server-down/test_no-server-down.yml
@@ -1,15 +1,8 @@
-version: "2"
-
 services:
   web:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web.nginx-proxy.tld
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_server-down/test_server-down.py b/test/test_server-down/test_server-down.py
index 995cd7d8e..a5b33c3cc 100644
--- a/test/test_server-down/test_server-down.py
+++ b/test/test_server-down/test_server-down.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_web_has_server_down(docker_compose, nginxproxy):
     conf = nginxproxy.get_conf().decode('ASCII')
     r = nginxproxy.get("http://web.nginx-proxy.tld/port")
diff --git a/test/test_server-down/test_server-down.yml b/test/test_server-down/test_server-down.yml
index 98fd30f28..f79808212 100644
--- a/test/test_server-down/test_server-down.yml
+++ b/test/test_server-down/test_server-down.yml
@@ -1,16 +1,9 @@
-version: "2"
-
 services:
   web:
     image: web
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web.nginx-proxy.tld
     network_mode: "none"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_ssl/cert_selection/nginx-proxy.tld.crt b/test/test_ssl/cert_selection/nginx-proxy.tld.crt
new file mode 100644
index 000000000..228b6dcb1
--- /dev/null
+++ b/test/test_ssl/cert_selection/nginx-proxy.tld.crt
@@ -0,0 +1,77 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: O=nginx-proxy test suite, CN=www.nginx-proxy.tld
+        Validity
+            Not Before: Dec  8 19:41:13 2024 GMT
+            Not After : Apr 25 19:41:13 2052 GMT
+        Subject: CN=nginx-proxy.tld
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:bb:ba:fc:be:dc:b4:94:57:9f:87:07:75:d3:da:
+                    15:4d:7a:7e:01:43:05:0f:84:73:f2:69:74:41:ac:
+                    e2:d1:9c:c6:56:e6:ad:fb:b7:b6:a6:d2:94:f1:68:
+                    52:c7:09:b6:19:ef:5b:68:60:ae:77:87:6e:62:b6:
+                    5d:b6:aa:a5:8e:01:a7:8c:39:24:e0:c1:4f:29:90:
+                    53:c8:3c:5b:b3:a4:f1:ed:56:33:ed:9c:69:1a:51:
+                    60:6f:a0:b9:57:22:73:8a:78:fe:e2:7e:f2:ac:e4:
+                    78:4c:9c:65:4b:db:f9:29:ba:59:8c:de:b3:56:80:
+                    14:5b:05:e1:0e:f0:dc:ac:19:9c:76:f8:77:5e:a8:
+                    37:2c:75:79:8d:9f:37:2b:22:30:98:ce:6e:9e:b6:
+                    27:68:e9:f5:23:54:38:3b:7d:3a:d1:34:02:3f:dd:
+                    86:c7:07:22:81:ec:f3:e2:53:18:96:50:3e:2b:66:
+                    07:b4:9d:2b:bd:95:16:f6:6b:96:a3:0a:ec:13:42:
+                    03:82:d2:07:95:77:1c:57:ab:3d:ad:21:8e:85:d8:
+                    78:96:55:bd:a3:30:33:fe:8b:45:31:ff:53:82:f1:
+                    2a:da:87:4e:89:10:d4:81:9e:bd:3d:10:4e:ba:6d:
+                    07:f5:f0:e2:14:33:10:2a:a5:8c:46:c1:06:4d:35:
+                    d9:19
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Alternative Name: 
+                DNS:nginx-proxy.tld, DNS:*.nginx-proxy.tld
+            X509v3 Subject Key Identifier: 
+                FD:F3:7F:43:D7:67:61:02:8A:DF:71:BD:BA:92:2D:BC:72:ED:B7:0A
+            X509v3 Authority Key Identifier: 
+                24:BE:7D:A4:7A:26:B7:EF:1D:50:DC:6F:F0:78:2B:62:32:9F:38:0F
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        9b:19:3b:42:3f:4d:a5:30:83:06:98:32:ed:f4:81:ff:14:76:
+        a4:aa:b7:dc:ef:d0:41:ee:64:2e:d1:ab:13:b3:76:c9:c8:46:
+        59:06:c5:0a:f9:aa:ea:89:e5:cc:0b:8f:6e:f8:4a:28:a0:63:
+        04:36:13:05:c4:98:e7:a1:16:88:ea:2b:8b:c8:95:d7:e4:50:
+        0f:b7:38:15:82:06:ee:1d:18:bc:91:5c:1f:a8:c2:88:ed:a4:
+        7e:5c:38:39:6c:ab:d3:4c:14:4d:ff:e0:de:f2:74:9b:e5:58:
+        a1:a7:47:e8:c3:79:36:e0:ff:83:6d:5b:87:43:83:ed:5c:ad:
+        e1:96:3d:7a:2d:a3:ff:f0:4b:32:57:d5:c0:3f:81:c2:69:86:
+        86:9e:e4:51:f4:49:9e:c5:78:a8:49:17:06:3f:26:53:11:6b:
+        88:c3:44:e3:b1:68:81:55:02:50:21:72:03:eb:0f:72:5c:04:
+        be:65:63:b0:9b:7b:7a:e1:ef:c1:da:cc:d6:5c:e0:ae:51:be:
+        9e:b3:9f:9a:aa:63:84:98:a8:b3:77:86:26:a8:24:c0:b8:10:
+        74:b4:f6:4f:53:6d:6b:77:f5:06:a0:b7:16:14:fa:94:47:49:
+        fa:7d:80:63:8c:0b:d3:f8:72:33:94:a0:b3:21:2c:a9:5b:2f:
+        d6:93:39:de
+-----BEGIN CERTIFICATE-----
+MIIDSDCCAjCgAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwPzEfMB0GA1UECgwWbmdp
+bngtcHJveHkgdGVzdCBzdWl0ZTEcMBoGA1UEAwwTd3d3Lm5naW54LXByb3h5LnRs
+ZDAgFw0yNDEyMDgxOTQxMTNaGA8yMDUyMDQyNTE5NDExM1owGjEYMBYGA1UEAwwP
+bmdpbngtcHJveHkudGxkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+u7r8vty0lFefhwd109oVTXp+AUMFD4Rz8ml0Qazi0ZzGVuat+7e2ptKU8WhSxwm2
+Ge9baGCud4duYrZdtqqljgGnjDkk4MFPKZBTyDxbs6Tx7VYz7ZxpGlFgb6C5VyJz
+inj+4n7yrOR4TJxlS9v5KbpZjN6zVoAUWwXhDvDcrBmcdvh3Xqg3LHV5jZ83KyIw
+mM5unrYnaOn1I1Q4O3060TQCP92Gxwcigezz4lMYllA+K2YHtJ0rvZUW9muWowrs
+E0IDgtIHlXccV6s9rSGOhdh4llW9ozAz/otFMf9TgvEq2odOiRDUgZ69PRBOum0H
+9fDiFDMQKqWMRsEGTTXZGQIDAQABo3EwbzAtBgNVHREEJjAkgg9uZ2lueC1wcm94
+eS50bGSCESoubmdpbngtcHJveHkudGxkMB0GA1UdDgQWBBT9839D12dhAorfcb26
+ki28cu23CjAfBgNVHSMEGDAWgBQkvn2keia37x1Q3G/weCtiMp84DzANBgkqhkiG
+9w0BAQsFAAOCAQEAmxk7Qj9NpTCDBpgy7fSB/xR2pKq33O/QQe5kLtGrE7N2ychG
+WQbFCvmq6onlzAuPbvhKKKBjBDYTBcSY56EWiOori8iV1+RQD7c4FYIG7h0YvJFc
+H6jCiO2kflw4OWyr00wUTf/g3vJ0m+VYoadH6MN5NuD/g21bh0OD7Vyt4ZY9ei2j
+//BLMlfVwD+BwmmGhp7kUfRJnsV4qEkXBj8mUxFriMNE47FogVUCUCFyA+sPclwE
+vmVjsJt7euHvwdrM1lzgrlG+nrOfmqpjhJios3eGJqgkwLgQdLT2T1Nta3f1BqC3
+FhT6lEdJ+n2AY4wL0/hyM5SgsyEsqVsv1pM53g==
+-----END CERTIFICATE-----
diff --git a/test/test_ssl/cert_selection/nginx-proxy.tld.key b/test/test_ssl/cert_selection/nginx-proxy.tld.key
new file mode 100644
index 000000000..776478ca6
--- /dev/null
+++ b/test/test_ssl/cert_selection/nginx-proxy.tld.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7uvy+3LSUV5+H
+B3XT2hVNen4BQwUPhHPyaXRBrOLRnMZW5q37t7am0pTxaFLHCbYZ71toYK53h25i
+tl22qqWOAaeMOSTgwU8pkFPIPFuzpPHtVjPtnGkaUWBvoLlXInOKeP7ifvKs5HhM
+nGVL2/kpulmM3rNWgBRbBeEO8NysGZx2+HdeqDcsdXmNnzcrIjCYzm6etido6fUj
+VDg7fTrRNAI/3YbHByKB7PPiUxiWUD4rZge0nSu9lRb2a5ajCuwTQgOC0geVdxxX
+qz2tIY6F2HiWVb2jMDP+i0Ux/1OC8Srah06JENSBnr09EE66bQf18OIUMxAqpYxG
+wQZNNdkZAgMBAAECggEAHhvUU4w0TiJrjI2OwUaV6hI+SVeFZUK6EeQF6E6hJjs9
+uExRFTEW01Ss3Lb9p7yP/0LbZzcyZCtNcfmLuDNQUCFFzQCRQJbgamsidNfxYTOQ
+NZ+Avpg6ZyUsEVs2vpng7BGR16PCqiYOgUMIIA2MvbuMh0JkgvgRy7N6sBnDWrqO
+f950DN1dmE1f+HNCx0Y0quwUf42ME4kio0gWodMx6cqtNJUMFmThUTtks/2t9qlV
+l9rbYfKRJen9MgZ9qYX5oMnnOU5tUvYb7ziayBVylGSbtx+2NpiouOKwujaBW3GH
+lnoGcfw63H6gJIh6AofQnzVAC2m9QqBbzHxqfJtZ8QKBgQDfGoiMX8k8Lbc+2FKj
+CBIpp6/Oe6hJIKwOKAswMf9fL/Ei3zKWrtlMwYxDovvGhIFIQSJ9KqFW6TfQ9m6i
+EGWbTL3jQfhT6x/LdOSI/aa+XqWVkiMdDAt+t7Zn91RA3uzIt6p/TAGFnItSznyy
+yt/Ranq79otmy2Wa4D6w309iFQKBgQDXaTmVO3tITq2pNow8+uzb+cvbA1Fj/dSu
+vBbvMlcEczDTRENcu7oB7fQphzRlYAflvQyW6pQfo0KstNv2G1yWJT7ukCkDGnaE
+j167fPw+/6QWlViEIsB6TIVHsGvOz+JPL//iHR0GJt9UC6E16SBEebvfUqId1LNz
+UOzKv7bP9QKBgH7bB2lJzZJ6LAd/2Pz6SdmFj2FIzpdGDI7AFhyBUUM+b030uz8S
+jFwocSjEM4TdMuVyo7mn07UnRqV6ec2MpTl4mT/u8tREjP+Sp599GqKEDoLNZUnO
+33pd20miSDXai6hVRoy7GuJt8IpU/nJrCHh6ou7dcMYyQMOfXgYT839BAoGBAKJo
+ODz2Wq2afD4e3T7ApMH5JKRcbQnpf2e6ccQn/Qli28X9KpiJBOWdhT+mK2/fJjUl
+Ao/qDoGH8qYJuelkmbquHDN7RyCK3B53haHvyrKoxQst0E3Xca0Dcl0pey6y91pi
+wxa0goR33FseZY4i1Owrp+TpBUdebWmc8tquDmPdAoGASnKqmt2XQtaY98oX7B66
+5ILSuigzXQ/U/cJBZ1VMJKlCJnIPNF3hApCMN8xTizoposDcHYdNGx7RkjnR+f+1
+2cMJogntrablkLdh0dPU8wlS04NcC7JXoclqj6ID75YlLD3BGwsBx7BLeS4h1cQ1
+NCKinLnF0touxbwjGqF+478=
+-----END PRIVATE KEY-----
diff --git a/test/test_ssl/cert_selection/web1.nginx-proxy.tld.crt b/test/test_ssl/cert_selection/web1.nginx-proxy.tld.crt
new file mode 100644
index 000000000..76042b996
--- /dev/null
+++ b/test/test_ssl/cert_selection/web1.nginx-proxy.tld.crt
@@ -0,0 +1,77 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: O=nginx-proxy test suite, CN=www.nginx-proxy.tld
+        Validity
+            Not Before: Dec  8 19:42:32 2024 GMT
+            Not After : Apr 25 19:42:32 2052 GMT
+        Subject: CN=web1.nginx-proxy.tld
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:e7:5c:7f:56:b3:eb:8f:16:81:07:05:1d:88:d4:
+                    bf:cd:3f:16:b8:3d:a5:a8:31:80:a3:c5:f0:a7:8f:
+                    29:d6:09:35:ad:48:6d:d6:20:8c:fe:78:98:50:aa:
+                    a1:03:86:ff:48:c0:e5:59:27:f8:89:13:08:99:20:
+                    c9:86:49:53:63:5a:c8:19:c5:c8:46:26:dc:3a:40:
+                    80:43:b8:86:e5:b8:73:33:1a:81:87:31:21:ea:aa:
+                    4e:9e:f9:cf:60:0a:66:06:81:dc:fc:6b:1c:72:1d:
+                    73:bc:2d:f5:eb:aa:87:cb:87:83:88:bc:a8:eb:4a:
+                    94:23:9d:56:77:cc:8b:46:0a:25:c7:27:17:45:3f:
+                    11:73:52:8d:5f:91:54:3b:b3:b2:28:cd:5b:55:79:
+                    32:88:fd:25:21:4f:f8:83:b3:f8:be:f7:ff:7f:f3:
+                    5d:b7:5b:40:ad:c5:87:e3:72:06:bf:93:22:12:f7:
+                    8d:d6:7d:49:44:1c:ac:7d:9a:02:cf:e0:e0:8d:db:
+                    aa:69:58:9e:5e:f2:00:ac:e6:8b:73:b3:aa:26:b0:
+                    50:40:ff:0a:73:d3:91:c3:1e:7c:6f:59:eb:ee:75:
+                    31:9d:71:19:ac:9e:ce:32:90:3e:bd:cb:30:fa:a4:
+                    a0:19:1f:0f:b5:91:5f:c9:3e:94:b8:52:d8:8c:6f:
+                    79:e9
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Alternative Name: 
+                DNS:web1.nginx-proxy.tld
+            X509v3 Subject Key Identifier: 
+                F4:08:B3:4A:A1:95:69:35:6B:2C:C7:D6:BE:99:25:F6:16:3F:21:7E
+            X509v3 Authority Key Identifier: 
+                24:BE:7D:A4:7A:26:B7:EF:1D:50:DC:6F:F0:78:2B:62:32:9F:38:0F
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        84:ba:99:25:10:82:ae:3f:55:14:3c:3c:e6:aa:5e:96:a7:76:
+        df:aa:71:77:54:bd:6d:6a:e9:19:c0:d9:81:7c:36:ff:be:39:
+        2e:03:a8:f2:a2:24:cf:63:ba:d0:cc:45:a5:58:0f:36:5f:8f:
+        21:23:b7:66:a6:5a:40:93:2f:25:18:3e:1b:40:bc:9c:77:4c:
+        ec:32:36:ff:64:49:89:98:5e:6c:e8:a5:dd:28:79:8a:b6:10:
+        05:9d:b4:f5:33:4d:32:5f:6b:44:d5:27:b7:e0:fb:b7:6e:04:
+        a6:3a:2e:4a:0f:3b:14:e1:94:39:e2:cb:c3:b9:97:da:9f:db:
+        c5:f4:fe:e3:58:6f:5c:43:2c:15:3b:24:5f:18:0e:d8:7b:73:
+        0e:64:8b:64:de:44:ac:96:1d:18:7b:54:d8:4e:72:86:df:f9:
+        8e:ae:dc:0d:3a:6d:9b:88:8e:c5:ee:55:ce:f8:0e:93:b2:fe:
+        06:6d:6e:91:f4:5b:55:b3:c4:09:b3:cc:c7:a8:7f:ab:d0:f9:
+        1c:04:30:07:51:ae:bc:18:10:1b:98:db:56:32:6a:0a:59:cd:
+        25:1d:a9:83:35:85:b6:2b:51:ad:4c:8f:b2:6f:50:8f:3d:da:
+        40:9b:8c:cc:d5:1e:ad:a1:00:fd:ac:b9:ba:fc:e9:1c:e9:a2:
+        08:cd:8b:be
+-----BEGIN CERTIFICATE-----
+MIIDPzCCAiegAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwPzEfMB0GA1UECgwWbmdp
+bngtcHJveHkgdGVzdCBzdWl0ZTEcMBoGA1UEAwwTd3d3Lm5naW54LXByb3h5LnRs
+ZDAgFw0yNDEyMDgxOTQyMzJaGA8yMDUyMDQyNTE5NDIzMlowHzEdMBsGA1UEAwwU
+d2ViMS5uZ2lueC1wcm94eS50bGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDnXH9Ws+uPFoEHBR2I1L/NPxa4PaWoMYCjxfCnjynWCTWtSG3WIIz+eJhQ
+qqEDhv9IwOVZJ/iJEwiZIMmGSVNjWsgZxchGJtw6QIBDuIbluHMzGoGHMSHqqk6e
++c9gCmYGgdz8axxyHXO8LfXrqofLh4OIvKjrSpQjnVZ3zItGCiXHJxdFPxFzUo1f
+kVQ7s7IozVtVeTKI/SUhT/iDs/i+9/9/8123W0CtxYfjcga/kyIS943WfUlEHKx9
+mgLP4OCN26ppWJ5e8gCs5otzs6omsFBA/wpz05HDHnxvWevudTGdcRmsns4ykD69
+yzD6pKAZHw+1kV/JPpS4UtiMb3npAgMBAAGjYzBhMB8GA1UdEQQYMBaCFHdlYjEu
+bmdpbngtcHJveHkudGxkMB0GA1UdDgQWBBT0CLNKoZVpNWssx9a+mSX2Fj8hfjAf
+BgNVHSMEGDAWgBQkvn2keia37x1Q3G/weCtiMp84DzANBgkqhkiG9w0BAQsFAAOC
+AQEAhLqZJRCCrj9VFDw85qpelqd236pxd1S9bWrpGcDZgXw2/745LgOo8qIkz2O6
+0MxFpVgPNl+PISO3ZqZaQJMvJRg+G0C8nHdM7DI2/2RJiZhebOil3Sh5irYQBZ20
+9TNNMl9rRNUnt+D7t24EpjouSg87FOGUOeLLw7mX2p/bxfT+41hvXEMsFTskXxgO
+2HtzDmSLZN5ErJYdGHtU2E5yht/5jq7cDTptm4iOxe5VzvgOk7L+Bm1ukfRbVbPE
+CbPMx6h/q9D5HAQwB1GuvBgQG5jbVjJqClnNJR2pgzWFtitRrUyPsm9Qjz3aQJuM
+zNUeraEA/ay5uvzpHOmiCM2Lvg==
+-----END CERTIFICATE-----
diff --git a/test/test_ssl/cert_selection/web1.nginx-proxy.tld.key b/test/test_ssl/cert_selection/web1.nginx-proxy.tld.key
new file mode 100644
index 000000000..7ee5cc501
--- /dev/null
+++ b/test/test_ssl/cert_selection/web1.nginx-proxy.tld.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDnXH9Ws+uPFoEH
+BR2I1L/NPxa4PaWoMYCjxfCnjynWCTWtSG3WIIz+eJhQqqEDhv9IwOVZJ/iJEwiZ
+IMmGSVNjWsgZxchGJtw6QIBDuIbluHMzGoGHMSHqqk6e+c9gCmYGgdz8axxyHXO8
+LfXrqofLh4OIvKjrSpQjnVZ3zItGCiXHJxdFPxFzUo1fkVQ7s7IozVtVeTKI/SUh
+T/iDs/i+9/9/8123W0CtxYfjcga/kyIS943WfUlEHKx9mgLP4OCN26ppWJ5e8gCs
+5otzs6omsFBA/wpz05HDHnxvWevudTGdcRmsns4ykD69yzD6pKAZHw+1kV/JPpS4
+UtiMb3npAgMBAAECggEASj98/i4vYnQuZDpYCBl+lDey6t2d1CROzEAxwxRGsNGz
+0DB2T0mS9fdtqjWYBrHEK2z8LWiOci8Ri1LiWZ4ejLwNi3fVle3Srz8T6qfFYuOW
+1Mek2eYCpHSTVqGE06WCqIP0j20wa87X3YRCb6cCfWa356Hj896zO9q6bSfPamIq
+/hW6x7jJcqY7T+/DnkIu5gFB135F8KTA+wcVtfkyuO1P85dqZKyAiBQ4xHDZ7dKp
+sqELryBVCT45DxXlIjY3QhuwqDas0o8em2ayoPSF372V52QqksnR4BS9tX6NIDQd
+ro10ZmEveNYJ8agKhBvpHHuDcjKQ0c5Mc4lG8qHEoQKBgQD8dF4p0DSF8uFyi42F
+vu/4tDidY738dWE5AhuHgfWtoUYlh5p7fX/bCajLjsNZJxNsEVqSQ3ubvTTepU9r
+iHZiWsbmZA60FiNB5iyYOhDY1ULYLW9K+SVzSejCOJOG+1RFciqq6Jm3PEmfhlsm
+s3fOYHad5RHes9Ewfl1RFzHwKwKBgQDqnEtmbbHSWWXucoEu0NOIqwMR+Fn25KQt
+80mpCJKpJ6BpGdogG2RXRWfNRBvbFg6p9vdFMB8hxijrk8B2EpkFQVwCx8FuT3qA
+U/QbcgbWIoxEsvCc04fLMcDOcNszZpnKisMieVzA9HS+ek93SbnaSRtZNNGnAcSp
+PkVxshdgOwKBgEXJ0YITmYFx/BrTM0NG3kXNZF02Bn404LSGvZ9/MLBYBfE4BF+g
++OhPSkdDZwNNRxQ30+bdGt2Zt3TZFBRw+/ECkTt9a4cjG4oLHEbUvnWCtuDV5o8+
+QrkVNHAEfdvxvIEaJ2tps5yw4NVlqesP782wYvoRKhh7cxfJxvg0xkxTAoGBAJGT
+rg2+32pg4qkVECfWmIvjYaJS8rAKq/1/SyPCGA8ycY0F552ooZitjn2GV6qYgzzf
+7AtYktjINzgGlJQvchgauFdZUCN82cyrS3uEQ8233kX6qucFMuvY0YTH7px0e9V8
+SR0pJW7twUs4ZfrlGpfiaT/vUHBK3pcN9tVX5r1lAoGAFss3yu7iwxZq5m/tzv53
+8lf35kq02Miia3Xu5Ahi6LHrhJmqc7OV6CV1bTaWb5ojf7R82nny5w0CTBk9qkFw
+i0hF4jYS0eEp5AF4fC0tW4nPim1Dz/Yr9EnWAfCIsS56fktqsPr12OR2OMMepnuf
+8gQm89DpS1l+hZou7msI41A=
+-----END PRIVATE KEY-----
diff --git a/test/test_ssl/wildcard_cert_and_nohttps/certs/default.crt b/test/test_ssl/certs_wildcard_nohttps/default.crt
similarity index 100%
rename from test/test_ssl/wildcard_cert_and_nohttps/certs/default.crt
rename to test/test_ssl/certs_wildcard_nohttps/default.crt
diff --git a/test/test_ssl/wildcard_cert_and_nohttps/certs/default.key b/test/test_ssl/certs_wildcard_nohttps/default.key
similarity index 100%
rename from test/test_ssl/wildcard_cert_and_nohttps/certs/default.key
rename to test/test_ssl/certs_wildcard_nohttps/default.key
diff --git a/test/test_ssl/wildcard_cert_and_nohttps/certs/web.nginx-proxy.tld.crt b/test/test_ssl/certs_wildcard_nohttps/web.nginx-proxy.tld.crt
similarity index 100%
rename from test/test_ssl/wildcard_cert_and_nohttps/certs/web.nginx-proxy.tld.crt
rename to test/test_ssl/certs_wildcard_nohttps/web.nginx-proxy.tld.crt
diff --git a/test/test_ssl/wildcard_cert_and_nohttps/certs/web.nginx-proxy.tld.key b/test/test_ssl/certs_wildcard_nohttps/web.nginx-proxy.tld.key
similarity index 100%
rename from test/test_ssl/wildcard_cert_and_nohttps/certs/web.nginx-proxy.tld.key
rename to test/test_ssl/certs_wildcard_nohttps/web.nginx-proxy.tld.key
diff --git a/test/test_ssl/compose.base.override.yml b/test/test_ssl/compose.base.override.yml
new file mode 100644
index 000000000..6bef2d35b
--- /dev/null
+++ b/test/test_ssl/compose.base.override.yml
@@ -0,0 +1,6 @@
+services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/certs:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_ssl/test_cert-selection.py b/test/test_ssl/test_cert-selection.py
new file mode 100644
index 000000000..c736dab6c
--- /dev/null
+++ b/test/test_ssl/test_cert-selection.py
@@ -0,0 +1,26 @@
+import json
+
+import pytest
+
+
+@pytest.mark.parametrize("host,expected_cert_ok,expected_cert", [
+    ("https://nginx-proxy.tld", True, "nginx-proxy.tld"),
+    ("https://www.nginx-proxy.tld", True, "nginx-proxy.tld"),
+    ("http://subdomain.www.nginx-proxy.tld", False, ""),
+    ("https://web1.nginx-proxy.tld", True, "web1.nginx-proxy.tld"),
+])
+def test_certificate_selection(
+    docker_compose,
+    nginxproxy,
+    host: str,
+    expected_cert_ok: bool,
+    expected_cert: str,
+):
+    r = nginxproxy.get(f"{host}/nginx-proxy-debug")
+    assert r.status_code == 200
+    try:
+        jsonResponse = json.loads(r.text)
+    except ValueError as err:
+        pytest.fail("Failed to parse debug endpoint response as JSON:: %s" % err, pytrace=False)
+    assert jsonResponse["vhost"]["cert_ok"] == expected_cert_ok
+    assert jsonResponse["vhost"]["cert"] == expected_cert
diff --git a/test/test_ssl/test_cert-selection.yml b/test/test_ssl/test_cert-selection.yml
new file mode 100644
index 000000000..51672f872
--- /dev/null
+++ b/test/test_ssl/test_cert-selection.yml
@@ -0,0 +1,32 @@
+services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/cert_selection:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/acme_root:/usr/share/nginx/html:ro
+    environment:
+      DEBUG_ENDPOINT: "true"
+
+  base:
+      image: web
+      environment:
+        WEB_PORTS: "80"
+        VIRTUAL_HOST: "nginx-proxy.tld"
+
+  www:
+      image: web
+      environment:
+        WEB_PORTS: "80"
+        VIRTUAL_HOST: "www.nginx-proxy.tld"
+
+  sub-www:
+      image: web
+      environment:
+        WEB_PORTS: "80"
+        VIRTUAL_HOST: "subdomain.www.nginx-proxy.tld"
+
+  web1:
+      image: web
+      environment:
+        WEB_PORTS: "80"
+        VIRTUAL_HOST: "web1.nginx-proxy.tld"
diff --git a/test/test_ssl/test_dhparam.yml b/test/test_ssl/test_dhparam.base.yml
similarity index 97%
rename from test/test_ssl/test_dhparam.yml
rename to test/test_ssl/test_dhparam.base.yml
index 456b1b3f8..428015ffa 100644
--- a/test/test_ssl/test_dhparam.yml
+++ b/test/test_ssl/test_dhparam.base.yml
@@ -1,4 +1,6 @@
-version: "2"
+networks:
+  default:
+    name: test_dhparam-net
 
 services:
   web5:
diff --git a/test/test_ssl/test_dhparam.py b/test/test_ssl/test_dhparam.py
index 1cbc0ac9a..9c8ee4d7b 100644
--- a/test/test_ssl/test_dhparam.py
+++ b/test/test_ssl/test_dhparam.py
@@ -1,3 +1,4 @@
+import platform
 import re
 import subprocess
 
@@ -7,6 +8,10 @@
 
 docker_client = docker.from_env()
 
+pytestmark = pytest.mark.skipif(
+    platform.system() == "Darwin",
+    reason="Those tests rely entirely on being able to directly contact container's IP"
+)
 
 ###############################################################################
 #
@@ -61,7 +66,7 @@ def versiontuple(v):
 @require_openssl("1.0.2")
 def negotiate_cipher(sut_container, additional_params='', grep='Cipher is'):
     sut_container.reload()
-    host = f"{sut_container.attrs['NetworkSettings']['Networks']['test_ssl_default']['IPAddress']}:443"
+    host = f"{sut_container.attrs['NetworkSettings']['Networks']['test_dhparam-net']['IPAddress']}:443"
 
     try:
         # Enforce TLS 1.2 as newer versions don't support custom dhparam or ciphersuite preference.
diff --git a/test/test_ssl/test_hsts.py b/test/test_ssl/test_hsts.py
index 890c4adb0..2007e0e6a 100644
--- a/test/test_ssl/test_hsts.py
+++ b/test/test_ssl/test_hsts.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_web1_HSTS_default(docker_compose, nginxproxy):
     r = nginxproxy.get("https://web1.nginx-proxy.tld/port", allow_redirects=False)
     assert "answer from port 81\n" in r.text
diff --git a/test/test_ssl/test_hsts.yml b/test/test_ssl/test_hsts.yml
index b84fb8009..50e624988 100644
--- a/test/test_ssl/test_hsts.yml
+++ b/test/test_ssl/test_hsts.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web
@@ -46,9 +44,3 @@ services:
       VIRTUAL_HOST: http3-vhost-enabled.nginx-proxy.tld
     labels:
       com.github.nginx-proxy.nginx-proxy.http3.enable: "true"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
diff --git a/test/test_ssl/test_https_port.py b/test/test_ssl/test_https-port.py
similarity index 99%
rename from test/test_ssl/test_https_port.py
rename to test/test_ssl/test_https-port.py
index ebe305f70..6a42f2d43 100644
--- a/test/test_ssl/test_https_port.py
+++ b/test/test_ssl/test_https-port.py
@@ -1,5 +1,6 @@
 import pytest
 
+
 @pytest.mark.parametrize("subdomain", ["foo", "bar"])
 def test_web1_http_redirects_to_https(docker_compose, nginxproxy, subdomain):
     r = nginxproxy.get("http://%s.nginx-proxy.tld:8080/" % subdomain, allow_redirects=False)
diff --git a/test/test_ssl/test_https-port.yml b/test/test_ssl/test_https-port.yml
new file mode 100644
index 000000000..de07aa73c
--- /dev/null
+++ b/test/test_ssl/test_https-port.yml
@@ -0,0 +1,16 @@
+services:
+  nginx-proxy:
+    environment:
+      HTTP_PORT: 8080
+      HTTPS_PORT: 8443
+    ports:
+      - "8080:8080"
+      - "8443:8443"
+
+  web1:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: "*.nginx-proxy.tld"
diff --git a/test/test_ssl/test_https_port.yml b/test/test_ssl/test_https_port.yml
deleted file mode 100644
index b6541acb0..000000000
--- a/test/test_ssl/test_https_port.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: "2"
-
-services:
-  web1:
-    image: web
-    expose:
-      - "81"
-    environment:
-      WEB_PORTS: "81"
-      VIRTUAL_HOST: "*.nginx-proxy.tld"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
-    environment:
-      HTTP_PORT: 8080
-      HTTPS_PORT: 8443
diff --git a/test/test_ssl/test_nohttp.py b/test/test_ssl/test_nohttp.py
index 032f60fd4..23aef783a 100644
--- a/test/test_ssl/test_nohttp.py
+++ b/test/test_ssl/test_nohttp.py
@@ -1,7 +1,3 @@
-import pytest
-import requests
-
-
 def test_web2_http_is_connection_refused(docker_compose, nginxproxy):
     r = nginxproxy.get("http://web2.nginx-proxy.tld/", allow_redirects=False)
     assert r.status_code == 503
diff --git a/test/test_ssl/test_nohttp.yml b/test/test_ssl/test_nohttp.yml
index 0c21bf9ca..4f6398a10 100644
--- a/test/test_ssl/test_nohttp.yml
+++ b/test/test_ssl/test_nohttp.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web2:
     image: web
@@ -9,10 +7,3 @@ services:
       WEB_PORTS: "82"
       VIRTUAL_HOST: "web2.nginx-proxy.tld"
       HTTPS_METHOD: nohttp
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_ssl/test_nohttps.py b/test/test_ssl/test_nohttps.py
index 23e822477..3efacbbb1 100644
--- a/test/test_ssl/test_nohttps.py
+++ b/test/test_ssl/test_nohttps.py
@@ -1,6 +1,7 @@
 import pytest
 from requests import ConnectionError
 
+
 def test_http_is_forwarded(docker_compose, nginxproxy):
     r = nginxproxy.get("http://web.nginx-proxy.tld/port", allow_redirects=False)
     assert r.status_code == 200
diff --git a/test/test_ssl/test_nohttps.yml b/test/test_ssl/test_nohttps.yml
index 209f57a8c..8106e79fe 100644
--- a/test/test_ssl/test_nohttps.yml
+++ b/test/test_ssl/test_nohttps.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web
@@ -9,9 +7,3 @@ services:
       WEB_PORTS: "83"
       VIRTUAL_HOST: "web.nginx-proxy.tld"
       HTTPS_METHOD: nohttps
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_ssl/test_noredirect.py b/test/test_ssl/test_noredirect.py
index 1d956d198..41147f44a 100644
--- a/test/test_ssl/test_noredirect.py
+++ b/test/test_ssl/test_noredirect.py
@@ -1,6 +1,3 @@
-import pytest
-
-
 def test_web3_http_is_forwarded(docker_compose, nginxproxy):
     r = nginxproxy.get("http://web3.nginx-proxy.tld/port", allow_redirects=False)
     assert r.status_code == 200
diff --git a/test/test_ssl/test_noredirect.yml b/test/test_ssl/test_noredirect.yml
index 7610ae212..e31358a93 100644
--- a/test/test_ssl/test_noredirect.yml
+++ b/test/test_ssl/test_noredirect.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web3:
     image: web
@@ -9,10 +7,3 @@ services:
       WEB_PORTS: "83"
       VIRTUAL_HOST: "web3.nginx-proxy.tld"
       HTTPS_METHOD: noredirect
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_ssl/test_redirect_custom.py b/test/test_ssl/test_redirect_custom.py
new file mode 100644
index 000000000..07c951d98
--- /dev/null
+++ b/test/test_ssl/test_redirect_custom.py
@@ -0,0 +1,38 @@
+import pytest
+
+
+@pytest.mark.parametrize("host,http_method,expected_code", [
+    ("nginx-proxy.tld", "GET", 301),
+    ("nginx-proxy.tld", "HEAD", 301),
+    ("nginx-proxy.tld", "POST", 308),
+    ("nginx-proxy.tld", "PUT", 308),
+    ("nginx-proxy.tld", "PATCH", 308),
+    ("nginx-proxy.tld", "DELETE", 308),
+    ("nginx-proxy.tld", "OPTIONS", 308),
+    ("nginx-proxy.tld", "CONNECT", 405),
+    ("nginx-proxy.tld", "TRACE", 405),
+    ("web2.nginx-proxy.tld", "GET", 301),
+    ("web2.nginx-proxy.tld", "HEAD", 301),
+    ("web2.nginx-proxy.tld", "POST", 307),
+    ("web2.nginx-proxy.tld", "PUT", 307),
+    ("web2.nginx-proxy.tld", "PATCH", 307),
+    ("web2.nginx-proxy.tld", "DELETE", 307),
+    ("web2.nginx-proxy.tld", "OPTIONS", 307),
+    ("web2.nginx-proxy.tld", "CONNECT", 405),
+    ("web2.nginx-proxy.tld", "TRACE", 405),
+])
+def test_custom_redirect_by_method(
+    docker_compose,
+    nginxproxy,
+    host: str,
+    http_method: str,
+    expected_code: int,
+):
+    r = nginxproxy.request(
+        method=http_method,
+        url=f'http://{host}',
+        allow_redirects=False,
+    )
+    assert r.status_code == expected_code
+    if expected_code in { 301, 302, 307, 308 }:
+        assert r.headers['Location'] == f'https://{host}/'
diff --git a/test/test_ssl/test_redirect_custom.yml b/test/test_ssl/test_redirect_custom.yml
new file mode 100644
index 000000000..19f883afe
--- /dev/null
+++ b/test/test_ssl/test_redirect_custom.yml
@@ -0,0 +1,22 @@
+services:
+  nginx-proxy:
+    environment:
+      NON_GET_REDIRECT: 308
+
+  web1:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: "nginx-proxy.tld"
+  
+  web2:
+    image: web
+    expose:
+      - "82"
+    environment:
+      WEB_PORTS: "82"
+      VIRTUAL_HOST: "web2.nginx-proxy.tld"
+    labels:
+      com.github.nginx-proxy.nginx-proxy.non-get-redirect: 307
diff --git a/test/test_ssl/test_redirect_default.py b/test/test_ssl/test_redirect_default.py
new file mode 100644
index 000000000..ca558a00d
--- /dev/null
+++ b/test/test_ssl/test_redirect_default.py
@@ -0,0 +1,28 @@
+import pytest
+
+
+@pytest.mark.parametrize("http_method,expected_code", [
+    ("GET", 301),
+    ("HEAD", 301),
+    ("POST", 301),
+    ("PUT", 301),
+    ("PATCH", 301),
+    ("DELETE", 301),
+    ("OPTIONS", 301),
+    ("CONNECT", 405),
+    ("TRACE", 405),
+])
+def test_default_redirect_by_method(
+    docker_compose,
+    nginxproxy,
+    http_method: str,
+    expected_code: int,
+):
+    r = nginxproxy.request(
+        method=http_method,
+        url='http://nginx-proxy.tld',
+        allow_redirects=False,
+    )
+    assert r.status_code == expected_code
+    if expected_code in { 301, 302, 307, 308 }:
+        assert r.headers['Location'] == 'https://nginx-proxy.tld/'
diff --git a/test/test_ssl/test_redirect_default.yml b/test/test_ssl/test_redirect_default.yml
new file mode 100644
index 000000000..17044fc54
--- /dev/null
+++ b/test/test_ssl/test_redirect_default.yml
@@ -0,0 +1,8 @@
+services:
+  web1:
+    image: web
+    expose:
+      - "81"
+    environment:
+      WEB_PORTS: "81"
+      VIRTUAL_HOST: "nginx-proxy.tld"
diff --git a/test/test_ssl/test_virtual_path.py b/test/test_ssl/test_virtual-path.py
similarity index 99%
rename from test/test_ssl/test_virtual_path.py
rename to test/test_ssl/test_virtual-path.py
index 72ac433b9..7dae6699b 100644
--- a/test/test_ssl/test_virtual_path.py
+++ b/test/test_ssl/test_virtual-path.py
@@ -1,6 +1,7 @@
 import pytest
 from requests import ConnectionError
 
+
 @pytest.mark.parametrize("path", ["web1", "web2"])
 def test_web1_http_redirects_to_https(docker_compose, nginxproxy, path):
     r = nginxproxy.get("http://www.nginx-proxy.tld/%s/port" % path, allow_redirects=False)
diff --git a/test/test_ssl/test_virtual_path.yml b/test/test_ssl/test_virtual-path.yml
similarity index 64%
rename from test/test_ssl/test_virtual_path.yml
rename to test/test_ssl/test_virtual-path.yml
index eb09ef0f6..bb52a7cb2 100644
--- a/test/test_ssl/test_virtual_path.yml
+++ b/test/test_ssl/test_virtual-path.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web
@@ -20,10 +18,3 @@ services:
       VIRTUAL_HOST: "www.nginx-proxy.tld"
       VIRTUAL_PATH: "/web2/"
       VIRTUAL_DEST: "/"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_ssl/wildcard_cert_and_nohttps/test_wildcard_cert_nohttps.py b/test/test_ssl/test_wildcard-cert-nohttps.py
similarity index 100%
rename from test/test_ssl/wildcard_cert_and_nohttps/test_wildcard_cert_nohttps.py
rename to test/test_ssl/test_wildcard-cert-nohttps.py
diff --git a/test/test_ssl/wildcard_cert_and_nohttps/docker-compose.yml b/test/test_ssl/test_wildcard-cert-nohttps.yml
similarity index 54%
rename from test/test_ssl/wildcard_cert_and_nohttps/docker-compose.yml
rename to test/test_ssl/test_wildcard-cert-nohttps.yml
index 7cc64e76d..21ca303c5 100644
--- a/test/test_ssl/wildcard_cert_and_nohttps/docker-compose.yml
+++ b/test/test_ssl/test_wildcard-cert-nohttps.yml
@@ -1,13 +1,16 @@
-version: "3"
+# In this scenario, we have a wildcard certificate for `*.web.nginx-proxy.tld` and 3 web containers:
+# - 1.web.nginx-proxy.tld
+# - 2.web.nginx-proxy.tld
+# - 3.web.nginx-proxy.tld
+#
+# We want web containers 1 and 2 to support SSL, but 3 should not (using `HTTPS_METHOD=nohttps`)
 
 services:
-
-  proxy:
-    image: nginxproxy/nginx-proxy:test
+  nginx-proxy:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
+      - ${PYTEST_MODULE_PATH}/certs_wildcard_nohttps:/etc/nginx/certs:ro
+      - ${PYTEST_MODULE_PATH}/acme_root:/usr/share/nginx/html:ro
 
   web1:
     image: web
diff --git a/test/test_ssl/test_wildcard.yml b/test/test_ssl/test_wildcard.yml
index b101e9f11..e2f50a48a 100644
--- a/test/test_ssl/test_wildcard.yml
+++ b/test/test_ssl/test_wildcard.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web
@@ -8,10 +6,3 @@ services:
     environment:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "*.nginx-proxy.tld"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
diff --git a/test/test_ssl/wildcard_cert_and_nohttps/README.md b/test/test_ssl/wildcard_cert_and_nohttps/README.md
deleted file mode 100644
index 0ccdd2ee9..000000000
--- a/test/test_ssl/wildcard_cert_and_nohttps/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-In this scenario, we have a wildcard certificate for `*.web.nginx-proxy.tld` and 3 web containers:
-- 1.web.nginx-proxy.tld
-- 2.web.nginx-proxy.tld
-- 3.web.nginx-proxy.tld
-
-We want web containers 1 and 2 to support SSL, but 3 should not (using `HTTPS_METHOD=nohttps`)
\ No newline at end of file
diff --git a/test/test_ssl/wildcard_cert_and_nohttps/acme_root/.well-known/acme-challenge/test-filename b/test/test_ssl/wildcard_cert_and_nohttps/acme_root/.well-known/acme-challenge/test-filename
deleted file mode 100644
index 5b45dff28..000000000
--- a/test/test_ssl/wildcard_cert_and_nohttps/acme_root/.well-known/acme-challenge/test-filename
+++ /dev/null
@@ -1 +0,0 @@
-challenge-teststring
diff --git a/test/test_trust-downstream-proxy/compose.base.override.yml b/test/test_trust-downstream-proxy/compose.base.override.yml
new file mode 100644
index 000000000..c51e6ff62
--- /dev/null
+++ b/test/test_trust-downstream-proxy/compose.base.override.yml
@@ -0,0 +1,5 @@
+services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/certs:/etc/nginx/certs:ro
diff --git a/test/test_trust-downstream-proxy/test_default.py b/test/test_trust-downstream-proxy/test_default.py
index f56c40628..b02bdae44 100644
--- a/test/test_trust-downstream-proxy/test_default.py
+++ b/test/test_trust-downstream-proxy/test_default.py
@@ -1,6 +1,7 @@
-import pytest
 import re
 
+import pytest
+
 
 @pytest.mark.parametrize('url,header,input,want', [
     ('http://web.nginx-proxy.tld/headers', 'X-Forwarded-Proto', None, 'http'),
diff --git a/test/test_trust-downstream-proxy/test_default.yml b/test/test_trust-downstream-proxy/test_default.yml
index 936dbad53..62e432a28 100644
--- a/test/test_trust-downstream-proxy/test_default.yml
+++ b/test/test_trust-downstream-proxy/test_default.yml
@@ -1,18 +1,9 @@
-version: "2"
-
 services:
   web:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: web.nginx-proxy.tld
       HTTPS_METHOD: noredirect
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs/web.nginx-proxy.tld.crt:/etc/nginx/certs/web.nginx-proxy.tld.crt:ro
-      - ./certs/web.nginx-proxy.tld.key:/etc/nginx/certs/web.nginx-proxy.tld.key:ro
diff --git a/test/test_trust-downstream-proxy/test_disabled.py b/test/test_trust-downstream-proxy/test_disabled.py
index 88c8054ca..201069c66 100644
--- a/test/test_trust-downstream-proxy/test_disabled.py
+++ b/test/test_trust-downstream-proxy/test_disabled.py
@@ -1,6 +1,7 @@
-import pytest
 import re
 
+import pytest
+
 
 @pytest.mark.parametrize('url,header,input,want', [
     ('http://web.nginx-proxy.tld/headers', 'X-Forwarded-Proto', None, 'http'),
diff --git a/test/test_trust-downstream-proxy/test_disabled.yml b/test/test_trust-downstream-proxy/test_disabled.yml
index 9318d6381..ebbedf2c9 100644
--- a/test/test_trust-downstream-proxy/test_disabled.yml
+++ b/test/test_trust-downstream-proxy/test_disabled.yml
@@ -1,20 +1,13 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      TRUST_DOWNSTREAM_PROXY: "false"
+
   web:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: web.nginx-proxy.tld
       HTTPS_METHOD: noredirect
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    environment:
-      TRUST_DOWNSTREAM_PROXY: "false"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs/web.nginx-proxy.tld.crt:/etc/nginx/certs/web.nginx-proxy.tld.crt:ro
-      - ./certs/web.nginx-proxy.tld.key:/etc/nginx/certs/web.nginx-proxy.tld.key:ro
diff --git a/test/test_trust-downstream-proxy/test_enabled.py b/test/test_trust-downstream-proxy/test_enabled.py
index f56c40628..b02bdae44 100644
--- a/test/test_trust-downstream-proxy/test_enabled.py
+++ b/test/test_trust-downstream-proxy/test_enabled.py
@@ -1,6 +1,7 @@
-import pytest
 import re
 
+import pytest
+
 
 @pytest.mark.parametrize('url,header,input,want', [
     ('http://web.nginx-proxy.tld/headers', 'X-Forwarded-Proto', None, 'http'),
diff --git a/test/test_trust-downstream-proxy/test_enabled.yml b/test/test_trust-downstream-proxy/test_enabled.yml
index 9a3e97554..29ef7dcef 100644
--- a/test/test_trust-downstream-proxy/test_enabled.yml
+++ b/test/test_trust-downstream-proxy/test_enabled.yml
@@ -1,20 +1,13 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      TRUST_DOWNSTREAM_PROXY: "true"
+
   web:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: web.nginx-proxy.tld
       HTTPS_METHOD: noredirect
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    environment:
-      TRUST_DOWNSTREAM_PROXY: "true"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs/web.nginx-proxy.tld.crt:/etc/nginx/certs/web.nginx-proxy.tld.crt:ro
-      - ./certs/web.nginx-proxy.tld.key:/etc/nginx/certs/web.nginx-proxy.tld.key:ro
diff --git a/test/stress_tests/test_unreachable_network/README.md b/test/test_unreachable-network/README.md
similarity index 100%
rename from test/stress_tests/test_unreachable_network/README.md
rename to test/test_unreachable-network/README.md
diff --git a/test/stress_tests/test_unreachable_network/test_unreachable_net.py b/test/test_unreachable-network/test_unreachable-network.py
similarity index 100%
rename from test/stress_tests/test_unreachable_network/test_unreachable_net.py
rename to test/test_unreachable-network/test_unreachable-network.py
diff --git a/test/stress_tests/test_unreachable_network/docker-compose.yml b/test/test_unreachable-network/test_unreachable-network.yml
similarity index 67%
rename from test/stress_tests/test_unreachable_network/docker-compose.yml
rename to test/test_unreachable-network/test_unreachable-network.yml
index f90a441e7..5b2cb2af2 100644
--- a/test/stress_tests/test_unreachable_network/docker-compose.yml
+++ b/test/test_unreachable-network/test_unreachable-network.yml
@@ -1,17 +1,12 @@
-version: "2"
-
 networks:
   netA:
   netB:
 
 services:
-  reverseproxy:
+  nginx-proxy:
     container_name: reverseproxy
     networks:
       - netA
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
 
   webA:
     networks:
@@ -20,7 +15,7 @@ services:
     expose:
       - 81
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: webA.nginx-proxy
 
   webB:
@@ -30,5 +25,5 @@ services:
     expose:
       - 82
     environment:
-      WEB_PORTS: 82
+      WEB_PORTS: "82"
       VIRTUAL_HOST: webB.nginx-proxy
diff --git a/test/test_upstream-name/test_predictable-name.py b/test/test_upstream-name/test_predictable-name.py
index 7e196461e..67ade3bde 100644
--- a/test/test_upstream-name/test_predictable-name.py
+++ b/test/test_upstream-name/test_predictable-name.py
@@ -1,4 +1,3 @@
-import pytest
 import re
 
 
diff --git a/test/test_upstream-name/test_predictable-name.yml b/test/test_upstream-name/test_predictable-name.yml
index b5caad0fb..bc81fb366 100644
--- a/test/test_upstream-name/test_predictable-name.yml
+++ b/test/test_upstream-name/test_predictable-name.yml
@@ -1,15 +1,8 @@
-version: "2"
-
 services:
   web:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: web.nginx-proxy.tld
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_upstream-name/test_sha1-name.py b/test/test_upstream-name/test_sha1-name.py
index 663ca28b5..8993440ac 100644
--- a/test/test_upstream-name/test_sha1-name.py
+++ b/test/test_upstream-name/test_sha1-name.py
@@ -1,4 +1,3 @@
-import pytest
 import re
 
 
diff --git a/test/test_upstream-name/test_sha1-name.yml b/test/test_upstream-name/test_sha1-name.yml
index b52a5c946..83c767d98 100644
--- a/test/test_upstream-name/test_sha1-name.yml
+++ b/test/test_upstream-name/test_sha1-name.yml
@@ -1,17 +1,12 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      SHA1_UPSTREAM_NAME: "true"
+
   web:
     image: web
     expose:
       - "80"
     environment:
-      WEB_PORTS: 80
+      WEB_PORTS: "80"
       VIRTUAL_HOST: web.nginx-proxy.tld
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
-      SHA1_UPSTREAM_NAME: "true"
diff --git a/test/test_vhost-empty-string.py b/test/test_vhost-empty-string/test_vhost-empty-string.py
similarity index 100%
rename from test/test_vhost-empty-string.py
rename to test/test_vhost-empty-string/test_vhost-empty-string.py
diff --git a/test/test_vhost-empty-string.yml b/test/test_vhost-empty-string/test_vhost-empty-string.yml
similarity index 86%
rename from test/test_vhost-empty-string.yml
rename to test/test_vhost-empty-string/test_vhost-empty-string.yml
index 9d2ff529e..4daf5c2e1 100644
--- a/test/test_vhost-empty-string.yml
+++ b/test/test_vhost-empty-string/test_vhost-empty-string.yml
@@ -1,11 +1,4 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-
   web1:
     image: web
     expose:
diff --git a/test/test_vhost-in-multiple-networks.py b/test/test_vhost-in-multiple-networks/test_vhost-in-multiple-networks.py
similarity index 91%
rename from test/test_vhost-in-multiple-networks.py
rename to test/test_vhost-in-multiple-networks/test_vhost-in-multiple-networks.py
index 02ef19ea8..6b30b530a 100644
--- a/test/test_vhost-in-multiple-networks.py
+++ b/test/test_vhost-in-multiple-networks/test_vhost-in-multiple-networks.py
@@ -1,6 +1,8 @@
-import pytest
 import logging
-import time
+from time import sleep
+
+import pytest
+
 
 def test_forwards_to_web1(docker_compose, nginxproxy):
     r = nginxproxy.get("http://web1.nginx-proxy.example/port")
@@ -11,11 +13,11 @@ def test_nginx_config_remains_the_same_after_restart(docker_compose, nginxproxy)
     """
     Restarts the Web container and returns nginx-proxy config after restart
     """
-    def get_conf_after_web_container_restart():
+    def get_conf_after_web_container_restart() -> bytes:
         web_containers = docker_compose.containers.list(filters={"ancestor": "web:latest"})
         assert len(web_containers) == 1
         web_containers[0].restart()
-        time.sleep(3)
+        sleep(3)
 
         return nginxproxy.get_conf()
 
diff --git a/test/test_vhost-in-multiple-networks.yml b/test/test_vhost-in-multiple-networks/test_vhost-in-multiple-networks.yml
similarity index 57%
rename from test/test_vhost-in-multiple-networks.yml
rename to test/test_vhost-in-multiple-networks/test_vhost-in-multiple-networks.yml
index 4e9bb3e9e..5b8b1cfa3 100644
--- a/test/test_vhost-in-multiple-networks.yml
+++ b/test/test_vhost-in-multiple-networks/test_vhost-in-multiple-networks.yml
@@ -1,15 +1,10 @@
-version: "2"
-
 networks:
-  net1: {}
-  net2: {}
-  net3: {}
+  net1:
+  net2:
+  net3:
 
 services:
   nginx-proxy:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
     networks:
       - net1
 
@@ -18,7 +13,7 @@ services:
     expose:
       - "81"
     environment:
-      WEB_PORTS: 81
+      WEB_PORTS: "81"
       VIRTUAL_HOST: web1.nginx-proxy.example
     networks:
       - net1
diff --git a/test/test_virtual-path/test_custom_conf.py b/test/test_virtual-path/test_custom-conf.py
similarity index 99%
rename from test/test_virtual-path/test_custom_conf.py
rename to test/test_virtual-path/test_custom-conf.py
index eec149f37..48a89b3b6 100644
--- a/test/test_virtual-path/test_custom_conf.py
+++ b/test/test_virtual-path/test_custom-conf.py
@@ -1,5 +1,6 @@
 import pytest
 
+
 def test_default_root_response(docker_compose, nginxproxy):
     r = nginxproxy.get("http://nginx-proxy.test/")
     assert r.status_code == 418
diff --git a/test/test_virtual-path/test_custom_conf.yml b/test/test_virtual-path/test_custom-conf.yml
similarity index 68%
rename from test/test_virtual-path/test_custom_conf.yml
rename to test/test_virtual-path/test_custom-conf.yml
index 2c4d6b9e8..b699352b6 100644
--- a/test/test_virtual-path/test_custom_conf.yml
+++ b/test/test_virtual-path/test_custom-conf.yml
@@ -1,6 +1,13 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    environment:
+      DEFAULT_ROOT: 418
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/foo.conf:/etc/nginx/vhost.d/foo.nginx-proxy.test:ro
+      - ${PYTEST_MODULE_PATH}/bar.conf:/etc/nginx/vhost.d/nginx-proxy.test_918d687a929083edd0c7224ee2293e0e7c062ab4_location:ro
+      - ${PYTEST_MODULE_PATH}/alternate.conf:/etc/nginx/vhost.d/nginx-proxy.test_7fb22b74bbdf907425dbbad18e4462565cada230_location:ro
+
   foo:
     image: web
     expose:
@@ -37,13 +44,3 @@ services:
       WEB_PORTS: "83"
       VIRTUAL_HOST: "nginx-proxy.test"
       VIRTUAL_PATH: "~ ^/(web3|alt)/"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    environment:
-      DEFAULT_ROOT: 418
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./foo.conf:/etc/nginx/vhost.d/foo.nginx-proxy.test:ro
-      - ./bar.conf:/etc/nginx/vhost.d/nginx-proxy.test_918d687a929083edd0c7224ee2293e0e7c062ab4_location:ro
-      - ./alternate.conf:/etc/nginx/vhost.d/nginx-proxy.test_7fb22b74bbdf907425dbbad18e4462565cada230_location:ro
diff --git a/test/test_virtual-path/test_default-root-none.yml b/test/test_virtual-path/test_default-root-none.yml
index f0172e8f5..2f7cddace 100644
--- a/test/test_virtual-path/test_default-root-none.yml
+++ b/test/test_virtual-path/test_default-root-none.yml
@@ -1,10 +1,5 @@
-version: "2"
-
 services:
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
+  nginx-proxy:
     environment:
       DEFAULT_ROOT: none
 
diff --git a/test/test_virtual-path/test_forwarding.py b/test/test_virtual-path/test_forwarding.py
index 062dd6cc3..9035ad99e 100644
--- a/test/test_virtual-path/test_forwarding.py
+++ b/test/test_virtual-path/test_forwarding.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_root_redirects_to_web1(docker_compose, nginxproxy):
     r = nginxproxy.get("http://www.nginx-proxy.tld/port", allow_redirects=False)
     assert r.status_code == 301
diff --git a/test/test_virtual-path/test_forwarding.yml b/test/test_virtual-path/test_forwarding.yml
index 9b15c7416..8988da0c6 100644
--- a/test/test_virtual-path/test_forwarding.yml
+++ b/test/test_virtual-path/test_forwarding.yml
@@ -1,6 +1,11 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/certs:/etc/nginx/certs:ro
+    environment:
+      DEFAULT_ROOT: "301 http://$$host/web1$$request_uri"
+
   web1:
     image: web
     expose:
@@ -10,11 +15,3 @@ services:
       VIRTUAL_HOST: "www.nginx-proxy.tld"
       VIRTUAL_PATH: "/web1/"
       VIRTUAL_DEST: "/"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-    environment:
-      - DEFAULT_ROOT=301 http://$$host/web1$$request_uri
diff --git a/test/test_virtual-path/test_location_precedence.py b/test/test_virtual-path/test_location-precedence.py
similarity index 98%
rename from test/test_virtual-path/test_location_precedence.py
rename to test/test_virtual-path/test_location-precedence.py
index 415c6c1c8..9d4d1ec49 100644
--- a/test/test_virtual-path/test_location_precedence.py
+++ b/test/test_virtual-path/test_location-precedence.py
@@ -1,5 +1,3 @@
-import pytest
-
 def test_location_precedence_case1(docker_compose, nginxproxy):
     r = nginxproxy.get(f"http://foo.nginx-proxy.test/web1/port")
     assert r.status_code == 200
diff --git a/test/test_virtual-path/test_location_precedence.yml b/test/test_virtual-path/test_location-precedence.yml
similarity index 65%
rename from test/test_virtual-path/test_location_precedence.yml
rename to test/test_virtual-path/test_location-precedence.yml
index a250a1d27..9d948a5fd 100644
--- a/test/test_virtual-path/test_location_precedence.yml
+++ b/test/test_virtual-path/test_location-precedence.yml
@@ -1,6 +1,11 @@
-version: "2"
-
 services:
+  nginx-proxy:
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ${PYTEST_MODULE_PATH}/default.conf:/etc/nginx/vhost.d/default_location:ro
+      - ${PYTEST_MODULE_PATH}/host.conf:/etc/nginx/vhost.d/bar.nginx-proxy.test_location:ro
+      - ${PYTEST_MODULE_PATH}/path.conf:/etc/nginx/vhost.d/bar.nginx-proxy.test_99f2db0ed8aa95dbb5b87fca79c7eff2ff6bb8bd_location:ro
+
   web1:
     image: web
     expose:
@@ -30,11 +35,3 @@ services:
       VIRTUAL_HOST: "bar.nginx-proxy.test"
       VIRTUAL_PATH: "/web3/"
       VIRTUAL_DEST: "/"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./default.conf:/etc/nginx/vhost.d/default_location:ro
-      - ./host.conf:/etc/nginx/vhost.d/bar.nginx-proxy.test_location:ro
-      - ./path.conf:/etc/nginx/vhost.d/bar.nginx-proxy.test_99f2db0ed8aa95dbb5b87fca79c7eff2ff6bb8bd_location:ro
diff --git a/test/test_virtual-path/test_virtual_paths.py b/test/test_virtual-path/test_virtual-paths.py
similarity index 94%
rename from test/test_virtual-path/test_virtual_paths.py
rename to test/test_virtual-path/test_virtual-paths.py
index a91a8dd42..a8cd276aa 100644
--- a/test/test_virtual-path/test_virtual_paths.py
+++ b/test/test_virtual-path/test_virtual-paths.py
@@ -3,6 +3,7 @@
 import pytest
 from docker.errors import NotFound
 
+
 @pytest.mark.parametrize("stub,expected_port", [
     ("nginx-proxy.test/web1", 81),
     ("nginx-proxy.test/web2", 82),
@@ -22,7 +23,7 @@ def test_invalid_path(docker_compose, nginxproxy, stub):
     r = nginxproxy.get(f"http://{stub}/port")
     assert r.status_code in [404, 503]
 
-@pytest.fixture()
+@pytest.fixture
 def web4(docker_compose):
     """
     pytest fixture creating a web container with `VIRTUAL_HOST=nginx-proxy.test`, `VIRTUAL_PATH=/web4/` and `VIRTUAL_DEST=/` listening on port 84.
@@ -39,7 +40,7 @@ def web4(docker_compose):
         },
         ports={"84/tcp": None}
     )
-    docker_compose.networks.get("test_virtual-path_default").connect(container)
+    docker_compose.networks.get("test_virtual-path-net").connect(container)
     sleep(2)  # give it some time to initialize and for docker-gen to detect it
     yield container
     try:
diff --git a/test/test_virtual-path/test_virtual_paths.yml b/test/test_virtual-path/test_virtual-paths.yml
similarity index 84%
rename from test/test_virtual-path/test_virtual_paths.yml
rename to test/test_virtual-path/test_virtual-paths.yml
index ac70297ec..47fb7ffef 100644
--- a/test/test_virtual-path/test_virtual_paths.yml
+++ b/test/test_virtual-path/test_virtual-paths.yml
@@ -1,4 +1,6 @@
-version: "2"
+networks:
+  default:
+    name: "test_virtual-path-net"
 
 services:
   foo:
@@ -37,8 +39,3 @@ services:
       WEB_PORTS: "83"
       VIRTUAL_HOST: "nginx-proxy.test"
       VIRTUAL_PATH: "/"
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
diff --git a/test/test_virtual-proto/nginx-proxy.tld.crt b/test/test_virtual-proto/nginx-proxy.tld.crt
new file mode 100644
index 000000000..cd7284b06
--- /dev/null
+++ b/test/test_virtual-proto/nginx-proxy.tld.crt
@@ -0,0 +1,70 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: O=nginx-proxy test suite, CN=www.nginx-proxy.tld
+        Validity
+            Not Before: Jan 10 00:08:52 2017 GMT
+            Not After : May 28 00:08:52 2044 GMT
+        Subject: CN=*.nginx-proxy.tld
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:cb:45:f4:14:9b:fe:64:85:79:4a:36:8d:3d:d1:
+                    27:d0:7c:36:28:30:e6:73:80:6f:7c:49:23:d0:6c:
+                    17:e4:44:c0:77:4d:9a:c2:bc:24:84:e3:a5:4d:ba:
+                    d2:da:51:7b:a1:2a:12:d4:c0:19:55:69:2c:22:27:
+                    2d:1a:f6:fc:4b:7f:e9:cb:a8:3c:e8:69:b8:d2:4f:
+                    de:4e:50:e2:d0:74:30:7c:42:5a:ae:aa:85:a5:b1:
+                    71:4d:c9:7e:86:8b:62:8c:3e:0d:e3:3b:c3:f5:81:
+                    0b:8c:68:79:fe:bf:10:fb:ae:ec:11:49:6d:64:5e:
+                    1a:7d:b3:92:93:4e:96:19:3a:98:04:a7:66:b2:74:
+                    61:2d:41:13:0c:a4:54:0d:2c:78:fd:b4:a3:e8:37:
+                    78:9a:de:fa:bc:2e:a8:0f:67:14:58:ce:c3:87:d5:
+                    14:0e:8b:29:7d:48:19:b2:a9:f5:b4:e8:af:32:21:
+                    67:15:7e:43:52:8b:20:cf:9f:38:43:bf:fd:c8:24:
+                    7f:52:a3:88:f2:f1:4a:14:91:2a:6e:91:6f:fb:7d:
+                    6a:78:c6:6d:2e:dd:1e:4c:2b:63:bb:3a:43:9c:91:
+                    f9:df:d3:08:13:63:86:7d:ce:e8:46:cf:f1:6c:1f:
+                    ca:f7:4c:de:d8:4b:e0:da:bc:06:d9:87:0f:ff:96:
+                    45:85
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Alternative Name: 
+                DNS:*.nginx-proxy.tld
+    Signature Algorithm: sha256WithRSAEncryption
+         6e:a5:0e:e4:d3:cc:d5:b7:fc:34:75:89:4e:98:8c:e7:08:06:
+         a8:5b:ec:13:7d:83:99:a2:61:b8:d5:12:6e:c5:b4:53:4e:9a:
+         22:cd:ad:14:30:6a:7d:58:d7:23:d9:a4:2a:96:a0:40:9e:50:
+         9f:ce:f2:fe:8c:dd:9a:ac:99:39:5b:89:2d:ca:e5:3e:c3:bc:
+         03:04:1c:12:d9:6e:b8:9f:f0:3a:be:12:44:7e:a4:21:86:73:
+         af:d5:00:51:3f:2c:56:70:34:8f:26:b0:7f:b0:cf:cf:7f:f9:
+         40:6f:00:29:c4:cf:c3:b7:c2:49:3d:3f:b0:26:78:87:b9:c7:
+         6c:1b:aa:6a:1a:dd:c5:eb:f2:69:ba:6d:46:0b:92:49:b5:11:
+         3c:eb:48:c7:2f:fb:33:a6:6a:82:a2:ab:f8:1e:5f:7d:e3:b7:
+         f2:fd:f5:88:a5:09:4d:a0:bc:f4:3b:cd:d2:8b:d7:57:1f:86:
+         3b:d2:3e:a4:92:21:b0:02:0b:e9:e0:c4:1c:f1:78:e2:58:a7:
+         26:5f:4c:29:c8:23:f0:6e:12:3f:bd:ad:44:7b:0b:bd:db:ba:
+         63:8d:07:c6:9d:dc:46:cc:63:40:ba:5e:45:82:dd:9a:e5:50:
+         e8:e7:d7:27:88:fc:6f:1d:8a:e7:5c:49:28:aa:10:29:75:28:
+         c7:52:de:f9
+-----BEGIN CERTIFICATE-----
+MIIC9zCCAd+gAwIBAgICEAAwDQYJKoZIhvcNAQELBQAwPzEfMB0GA1UECgwWbmdp
+bngtcHJveHkgdGVzdCBzdWl0ZTEcMBoGA1UEAwwTd3d3Lm5naW54LXByb3h5LnRs
+ZDAeFw0xNzAxMTAwMDA4NTJaFw00NDA1MjgwMDA4NTJaMBwxGjAYBgNVBAMMESou
+bmdpbngtcHJveHkudGxkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+y0X0FJv+ZIV5SjaNPdEn0Hw2KDDmc4BvfEkj0GwX5ETAd02awrwkhOOlTbrS2lF7
+oSoS1MAZVWksIictGvb8S3/py6g86Gm40k/eTlDi0HQwfEJarqqFpbFxTcl+hoti
+jD4N4zvD9YELjGh5/r8Q+67sEUltZF4afbOSk06WGTqYBKdmsnRhLUETDKRUDSx4
+/bSj6Dd4mt76vC6oD2cUWM7Dh9UUDospfUgZsqn1tOivMiFnFX5DUosgz584Q7/9
+yCR/UqOI8vFKFJEqbpFv+31qeMZtLt0eTCtjuzpDnJH539MIE2OGfc7oRs/xbB/K
+90ze2Evg2rwG2YcP/5ZFhQIDAQABoyAwHjAcBgNVHREEFTATghEqLm5naW54LXBy
+b3h5LnRsZDANBgkqhkiG9w0BAQsFAAOCAQEAbqUO5NPM1bf8NHWJTpiM5wgGqFvs
+E32DmaJhuNUSbsW0U06aIs2tFDBqfVjXI9mkKpagQJ5Qn87y/ozdmqyZOVuJLcrl
+PsO8AwQcEtluuJ/wOr4SRH6kIYZzr9UAUT8sVnA0jyawf7DPz3/5QG8AKcTPw7fC
+ST0/sCZ4h7nHbBuqahrdxevyabptRguSSbURPOtIxy/7M6ZqgqKr+B5ffeO38v31
+iKUJTaC89DvN0ovXVx+GO9I+pJIhsAIL6eDEHPF44linJl9MKcgj8G4SP72tRHsL
+vdu6Y40Hxp3cRsxjQLpeRYLdmuVQ6OfXJ4j8bx2K51xJKKoQKXUox1Le+Q==
+-----END CERTIFICATE-----
diff --git a/test/test_virtual-proto/nginx-proxy.tld.key b/test/test_virtual-proto/nginx-proxy.tld.key
new file mode 100644
index 000000000..91adb14e1
--- /dev/null
+++ b/test/test_virtual-proto/nginx-proxy.tld.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAy0X0FJv+ZIV5SjaNPdEn0Hw2KDDmc4BvfEkj0GwX5ETAd02a
+wrwkhOOlTbrS2lF7oSoS1MAZVWksIictGvb8S3/py6g86Gm40k/eTlDi0HQwfEJa
+rqqFpbFxTcl+hotijD4N4zvD9YELjGh5/r8Q+67sEUltZF4afbOSk06WGTqYBKdm
+snRhLUETDKRUDSx4/bSj6Dd4mt76vC6oD2cUWM7Dh9UUDospfUgZsqn1tOivMiFn
+FX5DUosgz584Q7/9yCR/UqOI8vFKFJEqbpFv+31qeMZtLt0eTCtjuzpDnJH539MI
+E2OGfc7oRs/xbB/K90ze2Evg2rwG2YcP/5ZFhQIDAQABAoIBAQCjAro2PNLJMfCO
+fyjNRgmzu6iCmpR0U68T8GN0JPsT576g7e8J828l0pkhuIyW33lRSThIvLSUNf9a
+dChL032H3lBTLduKVh4NKleQXnVFzaeEPoISSFVdButiAhAhPW4OIUVp0OfY3V+x
+fac3j2nDLAfL5SKAtqZv363Py9m66EBYm5BmGTQqT/frQWeCEBvlErQef5RIaU8p
+e2zMWgSNNojVai8U3nKNRvYHWeWXM6Ck7lCvkHhMF+RpbmCZuqhbEARVnehU/Jdn
+QHJ3nxeA2OWpoWKXvAHtSnno49yxq1UIstiQvY+ng5C5i56UlB60UiU2NJ6doZkB
+uQ7/1MaBAoGBAORdcFtgdgRALjXngFWhpCp0CseyUehn1KhxDCG+D1pJ142/ymcf
+oJOzKJPMRNDdDUBMnR1GBfy7rmwvYevI/SMNy2Qs7ofcXPbdtwwvTCToZ1V9/54k
+VfuPBFT+3QzWRvG1tjTV3E4L2VV3nrl2qNPhE5DlfIaU3nQq5Fl0HprJAoGBAOPf
+MWOTGev61CdODO5KN3pLAoamiPs5lEUlz3kM3L1Q52YLITxNDjRj9hWBUATJZOS2
+pLOoYRwmhD7vrnimMc41+NuuFX+4T7hWPc8uSuOxX0VijYtULyNRK57mncG1Fq9M
+RMLbOJ7FD+8jdXNsSMqpQ+pxLJRX/A10O2fOQnbdAoGAL5hV4YWSM0KZHvz332EI
+ER0MXiCJN7HkPZMKH0I4eu3m8hEmAyYxVndBnsQ1F37q0xrkqAQ/HTSUntGlS/og
+4Bxw5pkCwegoq/77tpto+ExDtSrEitYx4XMmSPyxX4qNULU5m3tzJgUML+b1etwD
+Rd2kMU/TC02dq4KBAy/TbRkCgYAl1xN5iJz+XenLGR/2liZ+TWR+/bqzlU006mF4
+pZUmbv/uJxz+yYD5XDwqOA4UrWjuvhG9r9FoflDprp2XdWnB556KxG7XhcDfSJr9
+A5/2DadXe1Ur9O/a+oi2228JEsxQkea9QPA3FVxfBtFjOHEiDlez39VaUP4PMeUH
+iO3qlQKBgFQhdTb7HeYnApYIDHLmd1PvjRvp8XKR1CpEN0nkw8HpHcT1q1MUjQCr
+iT6FQupULEvGmO3frQsgVeRIQDbEdZK3C5xCtn6qOw70sYATVf361BbTtidmU9yV
+THFxwDSVLiVZgFryoY/NtAc27sVdJnGsPRjjaeVgALAsLbmZ1K/H
+-----END RSA PRIVATE KEY-----
diff --git a/test/test_virtual-proto/ssl-app-multi-ports.conf b/test/test_virtual-proto/ssl-app-multi-ports.conf
new file mode 100644
index 000000000..03956b2ea
--- /dev/null
+++ b/test/test_virtual-proto/ssl-app-multi-ports.conf
@@ -0,0 +1,26 @@
+server {
+    listen 80;
+    server_name web2.nginx-proxy.tld;
+
+    location / {
+        default_type text/plain;
+        return 200 'This is web2.nginx-proxy.tld';
+    }
+}
+
+server {
+    listen 443 ssl;
+    server_name web3.nginx-proxy.tld;
+
+    ssl_certificate /etc/nginx/certs/server.crt;
+    ssl_certificate_key /etc/nginx/certs/server.key;
+
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_prefer_server_ciphers off;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305';
+
+    location / {
+        default_type text/plain;
+        return 200 'This is web3.nginx-proxy.tld';
+    }
+}
diff --git a/test/test_virtual-proto/ssl-app-single-port.conf b/test/test_virtual-proto/ssl-app-single-port.conf
new file mode 100644
index 000000000..26c7b6633
--- /dev/null
+++ b/test/test_virtual-proto/ssl-app-single-port.conf
@@ -0,0 +1,16 @@
+server {
+    listen 443 ssl;
+    server_name web1.nginx-proxy.tld;
+
+    ssl_certificate /etc/nginx/certs/server.crt;
+    ssl_certificate_key /etc/nginx/certs/server.key;
+
+    ssl_protocols TLSv1.2 TLSv1.3;
+    ssl_prefer_server_ciphers off;
+    ssl_ciphers 'ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-CHACHA20-POLY1305';
+
+    location / {
+        default_type text/plain;
+        return 200 'This is web1.nginx-proxy.tld';
+    }
+}
diff --git a/test/test_virtual-proto/test_virtual-proto.py b/test/test_virtual-proto/test_virtual-proto.py
new file mode 100644
index 000000000..b605b1312
--- /dev/null
+++ b/test/test_virtual-proto/test_virtual-proto.py
@@ -0,0 +1,8 @@
+import pytest
+
+
+@pytest.mark.parametrize('subdomain', ['web1', 'web2', 'web3'])
+def test_upstream_with_https_virtual_proto(docker_compose, nginxproxy, subdomain):
+    r = nginxproxy.get(f"http://{subdomain}.nginx-proxy.tld")
+    assert r.status_code == 200
+    assert r.text == f"This is {subdomain}.nginx-proxy.tld"
diff --git a/test/test_virtual-proto/test_virtual-proto.yml b/test/test_virtual-proto/test_virtual-proto.yml
new file mode 100644
index 000000000..60d072f31
--- /dev/null
+++ b/test/test_virtual-proto/test_virtual-proto.yml
@@ -0,0 +1,25 @@
+services:
+  ssl-app-single-port:
+    image: nginx:alpine
+    volumes:
+      - ${PYTEST_MODULE_PATH}/ssl-app-single-port.conf:/etc/nginx/conf.d/default.conf:ro
+      - ${PYTEST_MODULE_PATH}/nginx-proxy.tld.crt:/etc/nginx/certs/server.crt:ro
+      - ${PYTEST_MODULE_PATH}/nginx-proxy.tld.key:/etc/nginx/certs/server.key:ro
+    environment:
+      VIRTUAL_HOST: "web1.nginx-proxy.tld"
+      VIRTUAL_PROTO: "https"
+      VIRTUAL_PORT: "443"
+
+  ssl-app-multi-ports:
+    image: nginx:alpine
+    volumes:
+      - ${PYTEST_MODULE_PATH}/ssl-app-multi-ports.conf:/etc/nginx/conf.d/default.conf:ro
+      - ${PYTEST_MODULE_PATH}/nginx-proxy.tld.crt:/etc/nginx/certs/server.crt:ro
+      - ${PYTEST_MODULE_PATH}/nginx-proxy.tld.key:/etc/nginx/certs/server.key:ro
+    environment:
+      VIRTUAL_HOST_MULTIPORTS: |-
+        web2.nginx-proxy.tld:
+        web3.nginx-proxy.tld:
+          "/":
+            port: 443
+            proto: "https"
diff --git a/test/test_wildcard_host.py b/test/test_wildcard-host/test_wildcard-host.py
similarity index 100%
rename from test/test_wildcard_host.py
rename to test/test_wildcard-host/test_wildcard-host.py
diff --git a/test/test_wildcard_host.yml b/test/test_wildcard-host/test_wildcard-host.yml
similarity index 83%
rename from test/test_wildcard_host.yml
rename to test/test_wildcard-host/test_wildcard-host.yml
index 47e75e447..f82f7bcfb 100644
--- a/test/test_wildcard_host.yml
+++ b/test/test_wildcard-host/test_wildcard-host.yml
@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web
@@ -32,8 +30,3 @@ services:
     environment:
       WEB_PORTS: "84"
       VIRTUAL_HOST: ~^web4\..*\.nginx-proxy\.regexp$$ # we need to double the `$` because of docker compose variable interpolation
-
-  sut:
-    image: nginxproxy/nginx-proxy:test
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro