diff --git a/.travis.yml b/.travis.yml
index a1d67bc..ecdcd6d 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,8 +47,6 @@ before_install:
   # or if we put [publish binary] in the commit message
   - if test "${COMMIT_MESSAGE#*'[publish binary]'}" != "$COMMIT_MESSAGE"; then PUBLISH_BINARY=true; fi;
   - platform=$(uname -s | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/")
-  - docker build -t peterbraden/node-opencv .
-  - docker run peterbraden/node-opencv /bin/sh -c "cd /root/node-opencv; make test"
 
 install:
   # ensure source install works
@@ -56,6 +54,7 @@ install:
   # test our module
   - npm test
   - node lib/opencv.js
+  - docker build -t peterbraden/node-opencv .
 
 before_script:
   - echo "Publishing native platform Binary Package? ->" $PUBLISH_BINARY
diff --git a/Dockerfile b/Dockerfile
index dd98f18..5361267 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,5 +15,7 @@ run apt-get update
 run apt-get install -y libcv-dev libcvaux-dev libhighgui-dev libopencv-dev
 run curl -sL https://deb.nodesource.com/setup | bash -
 run apt-get install -y nodejs
-run	npm install opencv || cat npm-debug.log
-run add . /root/node-opencv
+WORKDIR /root/node-opencv
+add . /root/node-opencv
+run	npm install --unsafe-perm --build-from-source || cat npm-debug.log
+run make test