diff --git a/test/test_events.py b/test/test_events.py
index b5da3dd..9b99e93 100644
--- a/test/test_events.py
+++ b/test/test_events.py
@@ -22,6 +22,7 @@ def web1(docker_compose):
         },
         ports={"81/tcp": None}
     )
+    docker_compose.networks.get("test_default").connect(container)
     sleep(2)  # give it some time to initialize and for docker-gen to detect it
     yield container
     try:
@@ -46,6 +47,7 @@ def web2(docker_compose):
         },
         ports={"82/tcp": None}
     )
+    docker_compose.networks.get("test_default").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_server-down/test_load-balancing.yml b/test/test_server-down/test_load-balancing.yml
index bde23d6..2322590 100644
--- a/test/test_server-down/test_load-balancing.yml
+++ b/test/test_server-down/test_load-balancing.yml
@@ -24,7 +24,7 @@ services:
     environment:
       WEB_PORTS: 83
       VIRTUAL_HOST: web.nginx-proxy.tld
-    net: "none"
+    network_mode: "none"
 
   sut:
     image: nginxproxy/nginx-proxy:test
diff --git a/test/test_server-down/test_server-down.yml b/test/test_server-down/test_server-down.yml
index d4d109a..98fd30f 100644
--- a/test/test_server-down/test_server-down.yml
+++ b/test/test_server-down/test_server-down.yml
@@ -8,7 +8,7 @@ services:
     environment:
       WEB_PORTS: 81
       VIRTUAL_HOST: web.nginx-proxy.tld
-    net: "none"
+    network_mode: "none"
 
   sut:
     image: nginxproxy/nginx-proxy:test
diff --git a/test/test_ssl/test_dhparam.py b/test/test_ssl/test_dhparam.py
index d4d64a3..65dcfae 100644
--- a/test/test_ssl/test_dhparam.py
+++ b/test/test_ssl/test_dhparam.py
@@ -3,6 +3,7 @@ import subprocess
 
 import backoff
 import docker
+import pprint
 import pytest
 
 docker_client = docker.from_env()
@@ -60,7 +61,8 @@ def require_openssl(required_version):
 
 @require_openssl("1.0.2")
 def negotiate_cipher(sut_container, additional_params='', grep='Cipher is'):
-    host = f"{sut_container.attrs['NetworkSettings']['IPAddress']}:443"
+    sut_container.reload()
+    host = f"{sut_container.attrs['NetworkSettings']['Networks']['test_ssl_default']['IPAddress']}:443"
 
     try:
         # Enforce TLS 1.2 as newer versions don't support custom dhparam or ciphersuite preference.
@@ -77,7 +79,7 @@ def negotiate_cipher(sut_container, additional_params='', grep='Cipher is'):
     except subprocess.CalledProcessError as e:
         # Output a more helpful error, the original exception in this case isn't that helpful.
         # `from None` to ignore undesired output from exception chaining.
-        raise Exception("Failed to process CLI request:\n" + e.stderr) from None
+        raise Exception(f"Failed to process CLI request openssl s_client -connect {host} -tls1_2 {additional_params}:\n" + e.stderr) from None
 
 
 # The default `dh_bits` can vary due to configuration.
diff --git a/test/test_virtual-path/test_virtual_paths.py b/test/test_virtual-path/test_virtual_paths.py
index 115d47f..a91a8dd 100644
--- a/test/test_virtual-path/test_virtual_paths.py
+++ b/test/test_virtual-path/test_virtual_paths.py
@@ -39,6 +39,7 @@ def web4(docker_compose):
         },
         ports={"84/tcp": None}
     )
+    docker_compose.networks.get("test_virtual-path_default").connect(container)
     sleep(2)  # give it some time to initialize and for docker-gen to detect it
     yield container
     try: