diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index ac88ec9c..febe7c79 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -16,7 +16,7 @@ services:
       #- mysql-volume:/var/lib/mysql
       - /srv/initdb/mysql:/docker-entrypoint-initdb.d/
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: "mysqladmin ping -h localhost &&  echo 'show tables;' | mysql 'fet2020db' >/dev/null "
       timeout: 20s
       retries: 20
   etherpadsql:
@@ -25,14 +25,14 @@ services:
     networks:
      - testfet
     environment:
-      MYSQL_DATABASE: etherpaddb:10.7
+      MYSQL_DATABASE: etherpaddb
       MYSQL_USER: user
       MYSQL_PASSWORD: "hgu"
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: "mysqladmin ping -h localhost &&  echo 'show tables;' | mysql --port 3306 --protocol tcp 'etherpaddb' > /dev/null"
       timeout: 20s
       retries: 20
     volumes:
@@ -61,9 +61,9 @@ services:
     restart: unless-stopped
 #     - ./deployment/mysql.cnf:/etc/mysql/conf.d
     healthcheck: 
-      test: ["etherpad-healthcheck"]
-      timeout: 30s
-      interval: 30s
+      test: "curl --fail localhost:9001 >/dev/null "
+      timeout: 10s
+      interval: 15s
       retries: 30
   fet2020:
     image: docker.fet.at/fet2020django