diff --git a/Makefile b/Makefile
index aa881d6..2671693 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
-test: clean start-mongo
+test: start-mongo
 	tox
-	sudo docker stop surveil_test_mongo
 
-integration: clean start-mongo
+clean-test: clean stop-mongo start-mongo test
+
+integration: clean stop-mongo start-mongo
 	tox -eintegration
-	sudo docker stop surveil_test_mongo
+	stop-mongo
 
 clean:
 	rm -rf pbr-*.egg
@@ -12,9 +13,12 @@ clean:
 	rm -rf .tox
 	rm -rf .testrepository
 	rm -rf doc/build
-	- sudo docker kill surveil_test_mongo
-	- sudo docker rm surveil_test_mongo
 
 start-mongo:
 	sudo docker pull mongo
-	sudo docker run -d --name surveil_test_mongo -p 27017:27017 mongo mongod --smallfiles --noprealloc
+	- sudo docker run -d --name surveil_test_mongo -p 27017:27017 mongo mongod --smallfiles --noprealloc
+
+make stop-mongo:
+	- sudo docker stop surveil_test_mongo
+	- sudo docker kill surveil_test_mongo
+	- sudo docker rm surveil_test_mongo