diff --git a/Makefile b/Makefile
index 1135808e..3bc3e361 100644
--- a/Makefile
+++ b/Makefile
@@ -174,9 +174,16 @@ test-http-client-rotate:
 
 test-http-client:
 	@echo "Starting services with docker compose (waiting for healthchecks)..."
-	@docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d --build --wait
-	@echo "Running .http tests..."
-	@docker run --rm --network soundtouch-test-net \
+	@docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d --build --wait; \
+	UP_EXIT_CODE=$$?; \
+	if [ $$UP_EXIT_CODE -ne 0 ]; then \
+		echo "docker compose up failed (exit $$UP_EXIT_CODE); dumping container logs:"; \
+		docker compose -f docker-compose.yml -f docker-compose.ci.yml logs; \
+		docker compose -f docker-compose.yml -f docker-compose.ci.yml down; \
+		exit $$UP_EXIT_CODE; \
+	fi; \
+	echo "Running .http tests..."; \
+	docker run --rm --network soundtouch-test-net \
 		-v "$(PWD)/tests/integration/http-client:/workdir" \
 		jetbrains/intellij-http-client:2026.1 \
 		--env-file /workdir/http-client.env.json \
@@ -236,9 +243,7 @@ test-http-client:
 		/workdir/unregister_device.http \
 		--report; \
 	EXIT_CODE=$$?; \
-	docker compose -f docker-compose.yml -f docker-compose.ci.yml logs soundtouch-service; \
-	docker compose -f docker-compose.yml -f docker-compose.ci.yml logs spotify-mock; \
-	docker compose -f docker-compose.yml -f docker-compose.ci.yml logs amazon-mock; \
+	docker compose -f docker-compose.yml -f docker-compose.ci.yml logs; \
 	docker compose -f docker-compose.yml -f docker-compose.ci.yml down; \
 	exit $$EXIT_CODE
 
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
index b83ed433..033e1d09 100644
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@@ -35,7 +35,7 @@ services:
       start_period: 3s
 
   spotify-mock:
-    image: golang:1.27.0-alpine
+    image: golang:1.27.1-alpine
     container_name: spotify-mock
     working_dir: /app
     volumes:
@@ -53,7 +53,7 @@ services:
       start_period: 3s
 
   amazon-mock:
-    image: golang:1.27.0-alpine
+    image: golang:1.27.1-alpine
     container_name: amazon-mock
     working_dir: /app
     volumes:
@@ -71,7 +71,7 @@ services:
       start_period: 3s
 
   tunein-mock:
-    image: golang:1.27.0-alpine
+    image: golang:1.27.1-alpine
     container_name: tunein-mock
     working_dir: /app
     volumes: