diff --git a/Makefile b/Makefile
index 5f965f7..faf9642 100644
--- a/Makefile
+++ b/Makefile
@@ -13,4 +13,12 @@ test-alpine: update-dependencies
 	docker build -f Dockerfile.alpine -t jwilder/nginx-proxy:test .
 	test/pytest.sh
 
-test: test-debian test-alpine
+test-mainline:update-dependencies
+	docker build -f Dockerfile.mainline -t jwilder/nginx-proxy:test .
+	test/pytest.sh
+	
+test-mainline-alpine:update-dependencies
+	docker build -f Dockerfile.mainline.alpine -t jwilder/nginx-proxy:test .
+	test/pytest.sh
+
+test: test-debian test-alpine test-mainline-alpine test-mainline