diff --git a/docker-compose.test.yaml b/docker-compose.test.yaml
index 62543bed3..2bd6afe52 100644
--- a/docker-compose.test.yaml
+++ b/docker-compose.test.yaml
@@ -16,6 +16,7 @@ services:
     build:
       context: .
       dockerfile: docker/Dockerfile
+    entrypoint: ""
     command: bash -c "python -m unittest discover test.modules && python -m unittest discover test.reporting && python -m unittest discover test.unit"
     environment:
       TEST_REDIS_HOST: test-redis
diff --git a/scripts/test b/scripts/test
index e2cdbd8c8..a386b6cc1 100755
--- a/scripts/test
+++ b/scripts/test
@@ -12,16 +12,16 @@ docker compose -f docker-compose.test.yaml down --remove-orphans
 docker compose -f docker-compose.test.yaml up -d --build --scale test=0 --scale=test-e2e=0
 
 # Wait for the dependency services to be available
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-old-joomla-mysql:3306
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-old-wordpress-mysql:3306
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-service-with-bruteable-files:80
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-robots-service:80
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-ftp-server-with-easy-password:21
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-old-joomla:80
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-smtp-server:25
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-service-with-exposed-git:80
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-old-wordpress:80
-docker compose -f docker-compose.test.yaml run test /wait-for-it.sh test-service-with-directory-index:80
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-old-joomla-mysql:3306
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-old-wordpress-mysql:3306
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-service-with-bruteable-files:80
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-robots-service:80
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-ftp-server-with-easy-password:21
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-old-joomla:80
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-smtp-server:25
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-service-with-exposed-git:80
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-old-wordpress:80
+docker compose -f docker-compose.test.yaml run --entrypoint bash test /wait-for-it.sh test-service-with-directory-index:80
 
 # Set up Joomla instance
 docker compose -f docker-compose.test.yaml cp test/data/joomla/configuration.php test-old-joomla:/var/www/html
@@ -68,7 +68,7 @@ docker compose \
     -f docker-compose.test.yaml \
     -f docker-compose.yaml \
     -f docker-compose.test-e2e.yaml \
-    run \
+    run --entrypoint bash \
     test-e2e
 
 EXIT_CODE=$?
diff --git a/test/modules/test_classifier.py b/test/modules/test_classifier.py
index 2b7f4d579..772e62ab2 100644
--- a/test/modules/test_classifier.py
+++ b/test/modules/test_classifier.py
@@ -89,6 +89,11 @@ def test_parsing(self) -> None:
             TestData(
                 "CERT.pl",
                 [
+                    ExpectedTaskData(
+                        headers={"origin": "classifier", "type": "domain_that_may_not_exist"},
+                        payload={"domain": "cert.pl", "last_domain": "cert.pl"},
+                        payload_persistent={"original_domain": "cert.pl"},
+                    ),
                     ExpectedTaskData(
                         headers={"origin": "classifier", "type": "domain"},
                         payload={"domain": "cert.pl", "last_domain": "cert.pl"},