diff --git a/Dockerfile b/Dockerfile
index d87c7d2..27597e5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,9 +100,9 @@ RUN mkdir -p static /opt/unit/state/ /opt/unit/tmp/ \
           --config-file /opt/netbox/mkdocs.yml --site-dir /opt/netbox/netbox/project-static/docs/ \
       && SECRET_KEY="dummy" /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py collectstatic --no-input
 
-ENTRYPOINT [ "/opt/netbox/docker-entrypoint.sh" ]
+ENTRYPOINT [ "/sbin/tini", "--" ]
 
-CMD [ "/opt/netbox/launch-netbox.sh" ]
+CMD [ "/opt/netbox/docker-entrypoint.sh", "/opt/netbox/launch-netbox.sh" ]
 
 LABEL ORIGINAL_TAG="" \
       NETBOX_GIT_BRANCH="" \
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index df681d2..1ca0903 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -17,8 +17,6 @@ services:
     - ./reports:/etc/netbox/reports:z,ro
     - ./scripts:/etc/netbox/scripts:z,ro
     - netbox-media-files:/opt/netbox/netbox/media:z
-    ports:
-    - 8080
   postgres:
     image: postgres:13-alpine
     env_file: env/postgres.env
diff --git a/docker-compose.yml b/docker-compose.yml
index f38665b..2dbd7df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,9 +21,6 @@ services:
     depends_on:
     - redis
     - postgres
-    entrypoint:
-    - "/sbin/tini"
-    - "--"
     command:
     - /opt/netbox/venv/bin/python
     - /opt/netbox/netbox/manage.py
@@ -33,9 +30,6 @@ services:
     depends_on:
     - redis
     - postgres
-    entrypoint:
-    - "/sbin/tini"
-    - "--"
     command:
     - /opt/netbox/housekeeping.sh
 
diff --git a/test.sh b/test.sh
index f472477..d2091e4 100755
--- a/test.sh
+++ b/test.sh
@@ -56,13 +56,13 @@ test_setup() {
 
 test_netbox_unit_tests() {
   echo "⏱ Running NetBox Unit Tests"
-  SKIP_STARTUP_SCRIPTS=true $doco run --rm netbox ./manage.py test
+  $doco run --rm netbox /opt/netbox/venv/bin/python /opt/netbox/netbox/manage.py test
 }
 
 test_initializers() {
   echo "🏭 Testing Initializers"
   export INITIALIZERS_DIR
-  $doco run --rm netbox ./manage.py check
+  $doco run --rm netbox /opt/netbox/docker-entrypoint.sh ./manage.py check
 }
 
 test_cleanup() {