diff --git a/server-ce/test/Makefile b/server-ce/test/Makefile
index 8a821845c0..1e4810ea43 100644
--- a/server-ce/test/Makefile
+++ b/server-ce/test/Makefile
@@ -24,13 +24,13 @@ test-e2e-native:
 test-e2e:
 	docker compose build host-admin
 	docker compose up --detach --wait host-admin
-	docker compose up --detach --wait mongo || (docker compose logs mongo && exit 42)
-	docker compose up --no-log-prefix --exit-code-from=e2e e2e host-admin || (docker compose logs mongo && exit 42)
+	docker compose up --detach --wait mongo || { docker compose logs mongo; exit 42; }
+	docker compose up --no-log-prefix --exit-code-from=e2e e2e host-admin || { docker compose logs mongo; exit 42; }
 
 test-e2e-open:
 	docker compose up --detach --wait host-admin
-	docker compose up --detach --wait mongo || (docker compose logs mongo && exit 42)
-	docker compose up --no-log-prefix --exit-code-from=e2e-open e2e-open host-admin || (docker compose logs mongo && exit 42)
+	docker compose up --detach --wait mongo || { docker compose logs mongo; exit 42; }
+	docker compose up --no-log-prefix --exit-code-from=e2e-open e2e-open host-admin || { docker compose logs mongo; exit 42; }
 
 SHARD_PROJECT_NAMES = \
 	test-ce-default \
diff --git a/services/web/Makefile b/services/web/Makefile
index 372b3c7e48..bb9b74f577 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -142,7 +142,7 @@ test_unit_module: mongo_migrations_for_tests
 	$(MAKE) modules/$(MODULE_NAME)/test_unit
 
 mongo_migrations_for_tests:
-	$(DOCKER_COMPOSE) run --rm test_unit npm run migrations -- migrate -t saas
+	$(DOCKER_COMPOSE) run --rm test_unit npm run migrations -- migrate -t saas || { $(DOCKER_COMPOSE) logs mongo; exit 42; }
 
 #
 # Frontend tests
@@ -214,7 +214,7 @@ test_acceptance_app_server_pro: export COMPOSE_PROJECT_NAME=acceptance_test_serv
 test_acceptance_app_server_pro: export OVERLEAF_CONFIG=$(CFG_SERVER_PRO)
 
 $(TEST_ACCEPTANCE_APP):
-	$(DOCKER_COMPOSE) run --rm test_acceptance
+	$(DOCKER_COMPOSE) run --rm test_acceptance || { $(DOCKER_COMPOSE) logs mongo; exit 42; }
 	$(DOCKER_COMPOSE) down -v -t 0
 
 # We are using _make magic_ for turning these file-targets into calls to
@@ -361,7 +361,7 @@ TEST_ACCEPTANCE_MODULES_MERGED_VARIANTS = \
 	test_acceptance_modules_merged_server_pro \
 
 $(TEST_ACCEPTANCE_MODULES_MERGED_VARIANTS):
-	$(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner
+	$(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner || { $(DOCKER_COMPOSE) logs mongo; exit 42; }
 	$(DOCKER_COMPOSE) down -v -t 0
 
 # outer loop for running saas tests in parallel
@@ -382,7 +382,7 @@ test_acceptance_modules_merged_saas_4: export COMPOSE_PROJECT_NAME = \
 $(TEST_ACCEPTANCE_MODULES_MERGED_SPLIT_SAAS): export BASE_CONFIG = $(CFG_SAAS)
 
 $(TEST_ACCEPTANCE_MODULES_MERGED_SPLIT_SAAS): test_acceptance_modules_merged_saas_%:
-	$(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner_$*
+	$(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner_$* || { $(DOCKER_COMPOSE) logs mongo; exit 42; }
 	$(DOCKER_COMPOSE) down -v -t 0
 
 test_acceptance_modules: $(TEST_ACCEPTANCE_MODULES_MERGED_VARIANTS)
diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml
index e859ab8222..2f3c48e649 100644
--- a/services/web/docker-compose.ci.yml
+++ b/services/web/docker-compose.ci.yml
@@ -97,8 +97,6 @@ services:
 
   mongo:
     image: mongo:8.0.11
-    logging:
-      driver: none
     command: --replSet overleaf
     volumes:
       - ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js