diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 95cf7706a7e0197b6940b13b305ae7f22238715a..d2ab42161f8673ad117553147e6f65b32c802652 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,5 +1,6 @@
 FROM debian:latest
 RUN apt-get update && \
-	apt-get install tox curl -y
+	apt-get install tox curl python3-pip -y
+RUN pip3 install docker-compose
 COPY wait-for-it.sh /wait-for-it.sh
-CMD /wait-for-it.sh caosdb-server:10443 -t 60 -- curl https://caosdb-server:10443
+CMD /bin/bash
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc0bba34afed830a7c3b2edb1eb294685646b22a..aca54ba92cddf977aeb14f6c44b8adb067f02108 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,9 +53,10 @@ stages:
 
 test:
   tags: [docker]
-  image: 
-    name: docker/compose:1.24.1
-    entrypoint: ["/bin/sh", "-c"]
+  #image: 
+  #  name: docker/compose:1.24.1
+  #  entrypoint: ["/bin/sh", "-c"]
+  image: $CI_REGISTRY_IMAGE:latest
   script:
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
       - cd .docker
@@ -64,9 +65,8 @@ test:
         #- rc=$?
         #- docker-compose  down
         #- exit $rc
-      - ./wait-for-it.sh localhost:10443 -t 60 -- echo "ready"
+      - ./wait-for-it.sh localhost:10443 -t 60 -- curl https://localhost:10443
       - cd ..
-      - tox
 
 build-testenv:
   tags: [docker]