diff --git a/.buildbot/ubuntu/Dockerfile b/.buildbot/ubuntu/Dockerfile
index 803ecbc..c61c378 100644
--- a/.buildbot/ubuntu/Dockerfile
+++ b/.buildbot/ubuntu/Dockerfile
@@ -18,4 +18,4 @@ RUN pip install --upgrade pip tox virtualenv
 
 ADD . .
 
-CMD .buildbot/ubuntu/test.sh
+CMD .buildbot/ubuntu/build.sh && .buildbot/ubuntu/test.sh
diff --git a/docker-test.sh b/docker-test.sh
new file mode 100755
index 0000000..a11bf5e
--- /dev/null
+++ b/docker-test.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+DOCKERFILE=.buildbot/ubuntu/Dockerfile
+
+docker build -t minode/tox -f $DOCKERFILE .
+
+if [ $? -gt 0 ]; then
+    docker build --no-cache -t minode/tox -f $DOCKERFILE .
+fi
+
+docker run --rm -it minode/tox