diff --git a/Dockerfile b/Dockerfile
index 7761db74..733f96cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
-FROM ubuntu:12.10
+FROM python:2.7
 MAINTAINER Joffrey F <joffrey@dotcloud.com>
-RUN apt-get update
-RUN yes | apt-get install python-pip
 ADD . /home/docker-py
-RUN cd /home/docker-py && pip install .
+WORKDIR /home/docker-py
+RUN pip install -r test-requirements.txt
+RUN pip install .
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..4cb0ffda
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+.PHONY: all build test integration-test unit-test
+
+all: test
+
+build:
+	docker build -t docker-py .
+
+test: unit-test integration-test
+
+unit-test: build
+	docker run docker-py python tests/test.py
+
+integration-test: build
+	docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py python tests/integration_test.py
+