diff --git a/Makefile b/Makefile
index ce60493..5329bf1 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,8 @@ run: default ## Run debug build
 
 test: ## Run tests
 	#$(call cache_bust)
-	cargo test --all-features --no-fail-fast
+	cargo test --all-features --no-fail-fast -- --skip test_server_env_override
+	cargo test --all-features --no-fail-fast -- test_server_env_override
 
 #test.coverage.xml: ## Generate cobertura.xml test coverage
 #	#$(call cache_bust)