diff --git a/src/bash_functions.sh b/src/bash_functions.sh
index 6120c1b..607f982 100644
--- a/src/bash_functions.sh
+++ b/src/bash_functions.sh
@@ -104,11 +104,9 @@ migrate_gravity() {
     echo "  [i] Gravity migration checks"
     gravityDBfile=$(getFTLConfigValue files.gravity)
 
-    if [[ -z "${PYTEST}" ]]; then
-        if [[ ! -f /etc/pihole/adlists.list ]]; then
-            echo "  [i] No adlist file found, creating one with a default blocklist"
-            echo "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts" >/etc/pihole/adlists.list
-        fi
+    if [[ ! -f /etc/pihole/adlists.list ]]; then
+        echo "  [i] No adlist file found, creating one with a default blocklist"
+        echo "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts" >/etc/pihole/adlists.list
     fi
 
     if [ ! -f "${gravityDBfile}" ]; then
diff --git a/src/start.sh b/src/start.sh
index 9cee84e..72e3b52 100644
--- a/src/start.sh
+++ b/src/start.sh
@@ -146,12 +146,6 @@ stop() {
     echo "      https://docs.docker.com/engine/containers/start-containers-automatically/#use-a-restart-policy"
     echo ""
 
-    # If we are running pytest, keep the container alive for a little longer
-    # to allow the tests to complete
-    if [[ ${PYTEST} ]]; then
-        sleep 10
-    fi
-
     exit "${FTL_EXIT_CODE}"
 
 }
diff --git a/test/tests/conftest.py b/test/tests/conftest.py
index e445f00..29ce56c 100644
--- a/test/tests/conftest.py
+++ b/test/tests/conftest.py
@@ -45,10 +45,6 @@ def docker(request):
     for env_var in env_vars:
         cmd.extend(["-e", env_var])
 
-    # ensure PYTEST=1 is set
-    if not any("PYTEST=1" in arg for arg in cmd):
-        cmd.extend(["-e", "PYTEST=1"])
-
     # add default TZ if not already set
     if not any("TZ=" in arg for arg in cmd):
         cmd.extend(["-e", 'TZ="Europe/London"'])