diff --git a/.travis.yml b/.travis.yml
index 933338e56..132351bde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ script:
   #- docker-compose up -d
   #- docker logs sapl
   #- docker-compose rm -f -s -v
-  - docker-compose -f docker-compose.yml run --workdir="/var/interlegis/sapl" sapl bash -c "cp docker/config/env_test .env && py.test --create-db"
+  - docker-compose -f docker-compose-test.yml run --workdir="/var/interlegis/sapl" sapl bash -c "cp docker/config/env_test .env && py.test --create-db"
 
 after_script:
   # Cleanup docker containers, images, and volumes
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3771cb6ca..69ef33de3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -42,7 +42,6 @@ COPY docker/busy-wait.sh $HOME
 COPY docker/create_admin.py $HOME
 COPY docker/genkey.py $HOME
 COPY docker/gunicorn_start.sh $HOME
-COPY docker/config/env_test $HOME
 
 COPY docker/config/nginx/sapl.conf /etc/nginx/conf.d
 COPY docker/config/nginx/nginx.conf /etc/nginx/nginx.conf
diff --git a/docker/docker-compose-test.yml b/docker/docker-compose-test.yml
index 86d3d5f99..0bd76edf1 100644
--- a/docker/docker-compose-test.yml
+++ b/docker/docker-compose-test.yml
@@ -32,11 +32,9 @@ services:
     networks:
       - sapl-net
   sapl:
-#    image: interlegis/sapl:3.1.161-RC11
     build:
       context: ../
       dockerfile: ./docker/Dockerfile
-      # target: sapl
     container_name: sapl
     labels:
        NAME: "sapl"