diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 42524301b70a2858dcc82867ea6585d57493382b..b72250f945d565564b9e436e5fcaa9f45b2716a0 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -3,5 +3,7 @@ RUN apt-get update && \
 	apt-get install docker.io tox curl python3-pip -y
 RUN pip3 install docker-compose
 COPY wait-for-it.sh /wait-for-it.sh
-COPY ../tests /tests
-CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox /tests
+COPY . /git
+RUN rm -r /git/.git
+WORKDIR /git
+CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 844a064f969a7aea56aac75153552008808511c0..464a1cf53200fceaa96cc8fe7e028487aba53a52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,10 +78,9 @@ build-testenv:
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
         # use here general latest or specific branch latest...
       - docker pull $CI_REGISTRY_IMAGE:latest || true
-      - cd .docker
       - docker build 
         --pull
-        --file Dockerfile
+        --file .docker/Dockerfile
         --cache-from $CI_REGISTRY_IMAGE:latest 
         -t $CI_REGISTRY_IMAGE:latest .
       - docker push $CI_REGISTRY_IMAGE:latest