diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 81d89ad40743b1c008b38e146a89115f9b6c8006..69f27a45cfecc65f2dfd3203b73d333635d36bf5 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,4 +7,4 @@ RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \
 COPY . /git
 RUN rm -r /git/.git && mv /git/.docker/pycaosdb.ini /git 
 WORKDIR /git
-CMD .docker/run.sh
+CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- tox
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index e55f1719cde17c9f285d10cbd690fa710e36479a..953fb82a4c5084f49f2e52d08bd805cb083546c7 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -13,10 +13,6 @@ services:
       - sqldb
     networks:
       - caosnet
-    volumes:
-      - type: bind
-        source: "$CERTPATH"
-        target: /opt/caosdb/cert
     ports:
       # - "from_outside:from_inside"
       - "10443:10443"
diff --git a/.docker/pycaosdb.ini b/.docker/pycaosdb.ini
index e9c0926658bfec39744c2633f9c0357fd4221f42..17b437c3288bd3b10f6b3a1c19c25d7ced27b26f 100644
--- a/.docker/pycaosdb.ini
+++ b/.docker/pycaosdb.ini
@@ -4,7 +4,7 @@ test_server_side_scripting.bin_dir=../caosdb-server/test_scripting/bin/
 [Connection]
 url=https://caosdb-server:10443
 username=admin
-cacert=.docker/cert/caosdb.cert.pem
+cacert=/cert/caosdb.cert.pem
 #cacert=/etc/ssl/cert.pem
 debug=0
 
diff --git a/.docker/run-test.sh b/.docker/run-test.sh
deleted file mode 100755
index fbda7114965f1b664d257ce8a37de5b8a392b1d3..0000000000000000000000000000000000000000
--- a/.docker/run-test.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-tox
-echo $?>/test_success
-echo "Saved result value"
diff --git a/.docker/run.sh b/.docker/run.sh
index 39a66c56bf09be0b0aeec1d3135a8fe8ac4e33ef..00c7618f87295fbe67c7c485a9204b46adb1a438 100755
--- a/.docker/run.sh
+++ b/.docker/run.sh
@@ -1,2 +1,5 @@
-#!/bin/bash
-/wait-for-it.sh caosdb-server:10443 -t 500 -- .docker/run-test.sh
+#!/bin/sh
+
+docker-compose -f tester.yml run tester 
+rv=$?
+echo $rv > result
diff --git a/.docker/tester.yml b/.docker/tester.yml
index 2d22c8b32eabd3d2268b06e02929ea11542eb5fc..634ac13648a516021a98bafe2679347ddf03de6d 100644
--- a/.docker/tester.yml
+++ b/.docker/tester.yml
@@ -4,6 +4,10 @@ services:
     image: "$CI_REGISTRY_IMAGE:latest"
     networks:
       - docker_caosnet
+    volumes:
+      - type: bind
+        source: ./cert
+        target: /cert
 networks:
   docker_caosnet:
     external: true
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcccf9db8f051e4741c841bb7458213fd327cb86..c0a14a7848bf4c4d674d1265999751f1c42bd636 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,21 +79,20 @@ test:
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
       - docker pull $CI_REGISTRY_IMAGE:latest
       - cd .docker
-      - DIR=`pwd`
-      - CERTPATH=$DIR"/cert" CAOSDB_TAG=$CAOSDB_TAG docker-compose  up -d
-      # prevent this script from terminating when the return value is non-zero
-      - docker-compose -f tester.yml run tester 
+      - CAOSDB_TAG=$CAOSDB_TAG docker-compose  up -d
+      - docker cp docker_caosdb-server_1:/opt/caosdb/cert cert
+        # writes the return value of the tests into the file result
+      - /bin/sh ./run.sh 
       - docker logs docker_caosdb-server_1 &> ../caosdb_log.txt
       - docker logs docker_sqldb_1 &> ../mariadb_log.txt
       - docker-compose down
-      - docker cp docker_tester_1:/test_success test_success 
-      - rc=`cat test_success`
+      - rc=`cat result`
       - exit $rc
   artifacts:
     paths:
       - caosdb_log.txt
       - mariadb_log.txt
-        #when: on_failure
+    when: on_failure
     expire_in: 1 week
 
 build-testenv: