diff --git a/.drone.yml b/.drone.yml
index e4a108825c..6ce4f4185f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -247,6 +247,9 @@ pipeline:
     image: nextcloudci/integration-php7.0:integration-php7.0-4
     commands:
       - ./occ maintenance:install --admin-pass=admin
+      - ./occ config:system:set redis host --value=cache
+      - ./occ config:system:set redis port --value=6379 --type=integer
+      - ./occ config:system:set redis timeout --value=0 --type=integer
       - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local
       - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed
       - ./occ app:enable testing
diff --git a/autotest.sh b/autotest.sh
index 069488a334..307af64edb 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -212,7 +212,7 @@ function execute_tests {
                 fi
                 mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
             else
-                DATABASEHOST=127.0.0.1
+                DATABASEHOST=mysql
             fi
 		fi
         echo "Waiting for MySQL initialisation ..."
@@ -246,7 +246,7 @@ function execute_tests {
 				fi
 				mysql -u "$DATABASEUSER" -powncloud -e "DROP DATABASE IF EXISTS $DATABASENAME" -h $DATABASEHOST || true
 			else
-				DATABASEHOST=127.0.0.1
+				DATABASEHOST=mysqlmb4
 			fi
 		fi
 
@@ -308,6 +308,9 @@ function execute_tests {
 
 			echo "Postgres is up."
 		else
+			if [ ! -z "$DRONE" ] ; then
+				DATABASEHOST=postgres
+			fi
 			echo "Waiting for Postgres to be available ..."
 			if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 5432 60; then
 				echo "[ERROR] Waited 60 seconds, no response" >&2
diff --git a/tests/redis-cluster.config.php b/tests/redis-cluster.config.php
index c7df2a9185..e255d123f6 100644
--- a/tests/redis-cluster.config.php
+++ b/tests/redis-cluster.config.php
@@ -6,12 +6,12 @@ $CONFIG = [
 	'memcache.locking' => '\\OC\\Memcache\\Redis',
 	'redis.cluster' => [
 		'seeds' => [ // provide some/all of the cluster servers to bootstrap discovery, port required
-			'localhost:7000',
-			'localhost:7001',
-			'localhost:7002',
-			'localhost:7003',
-			'localhost:7004',
-			'localhost:7005'
+			'cache-cluster:7000',
+			'cache-cluster:7001',
+			'cache-cluster:7002',
+			'cache-cluster:7003',
+			'cache-cluster:7004',
+			'cache-cluster:7005'
 		],
 		'timeout' => 0.0,
 		'read_timeout' => 0.0,
diff --git a/tests/redis.config.php b/tests/redis.config.php
index 2ff46ec672..9d3f1eca63 100644
--- a/tests/redis.config.php
+++ b/tests/redis.config.php
@@ -5,7 +5,7 @@ $CONFIG = [
 	'memcache.distributed' => '\\OC\\Memcache\\Redis',
 	'memcache.locking' => '\\OC\\Memcache\\Redis',
 	'redis' => [
-		'host' => 'localhost',
+		'host' => 'cache',
 		'port' => 6379,
 		'timeout' => 0,
 	],