diff --git a/.travis.yml b/.travis.yml
index 9763939..d70b54f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ services:
   - docker
 before_install:
   - docker build -t bcbc/workstand:production .
+  - docker-compose -f docker-compose.yml -f docker-compose.prod.yml run workstand python manage.py test
 branches:
   only:
   - master
diff --git a/Dockerfile b/Dockerfile
index 1d3a352..610f6bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,5 @@ RUN bower install --allow-root
 ADD ./bikeshop_project/package.json package.json
 RUN npm install --unsafe-perm
 RUN npm run build-production
-RUN DJANGO_SETTINGS_MODULE=bikeshop.settings.production python manage.py test
 CMD 'bash -c "PYTHONUNBUFFERED=TRUE python manage.py migrate --no-input && python manage.py collectstatic --no-input && python manage.py rebuild_index --noinput && gunicorn --log-file=- -b 0.0.0.0:8000 bikeshop.wsgi:application"'
 EXPOSE 8000