diff --git a/test/s3/error_compat/Makefile b/test/s3/error_compat/Makefile
index ef1914bdad..759820d1ba 100644
--- a/test/s3/error_compat/Makefile
+++ b/test/s3/error_compat/Makefile
@@ -89,8 +89,9 @@ test-errors:
 		--access-key admin \
 		--secret-key admin
 
-test-with-server: start-server
-	@$(MAKE) test-errors; TEST_RESULT=$$?; \
+test-with-server:
+	@$(MAKE) start-server; START_RESULT=$$?; \
+	if [ $$START_RESULT -eq 0 ]; then $(MAKE) test-errors; TEST_RESULT=$$?; else TEST_RESULT=$$START_RESULT; fi; \
 	$(MAKE) stop-server; exit $$TEST_RESULT
 
 logs: