diff --git a/Makefile b/Makefile
index 381af5e..97a4982 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,10 @@
-test: clean
+test: clean start-mongo
 	tox
+	sudo docker stop surveil_test_mongo
+
+integration: clean
+	tox -eintegration
+	sudo docker stop surveil_test_mongo
 
 clean:
 	rm -rf pbr-*.egg
@@ -7,3 +12,9 @@ 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