diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..c8e7f7b8
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM n42org/tox
+MAINTAINER Matías Aguirre <matiasaguirre@gmail.com>
+RUN apt-get update
+RUN apt-get install -y make libxml2-dev libxmlsec1-dev
diff --git a/Makefile b/Makefile
index e96baf5d..781cccda 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,17 @@ setup-pyenv: check-pyenv
 run-tox:
 	@ tox
 
+docker-tox-build:
+	@ docker inspect omab/psa-social-core >/dev/null 2>&1 || ( \
+		docker build -t omab/psa-social-core . \
+	)
+
+docker-tox: docker-tox-build
+	@ docker run -it --rm \
+		     --name psa-social-core-test \
+		     -v "`pwd`:/code" \
+		     -w /code omab/psa-social-core tox
+
 tests: setup-pyenv run-tox clean
 
 clean: