diff --git a/docker/scripts/jobs/unit-tests.sh b/docker/scripts/jobs/unit-tests.sh
index a261ec6088..728de53143 100644
--- a/docker/scripts/jobs/unit-tests.sh
+++ b/docker/scripts/jobs/unit-tests.sh
@@ -11,14 +11,14 @@ start_db
 
 docker run \
     --user $(id -u):$(id -g) \
-    --link mysql:mysql \
-    --env PHPBB_TEST_DBMS="phpbb\db\driver\mysqli" \
-    --env PHPBB_TEST_DBHOST="mysql" \
-    --env PHPBB_TEST_DBPORT="3306" \
-    --env PHPBB_TEST_DBNAME="phpbb_tests" \
-    --env PHPBB_TEST_DBUSER="root" \
-    --env PHPBB_TEST_DBPASSWD="" \
-    --env PHPBB_TEST_TABLE_PREFIX="phpbb_" \
-    --volume ${bamboo.working.directory}:/data \
+    ${DOCKER_LINK} \
+    --env PHPBB_TEST_DBMS="${PHPBB_TEST_DBMS}" \
+    --env PHPBB_TEST_DBHOST="${PHPBB_TEST_DBHOST}" \
+    --env PHPBB_TEST_DBPORT="${PHPBB_TEST_DBPORT}" \
+    --env PHPBB_TEST_DBNAME="${PHPBB_TEST_DBNAME}" \
+    --env PHPBB_TEST_DBUSER="${PHPBB_TEST_DBUSER}" \
+    --env PHPBB_TEST_DBPASSWD="${PHPBB_TEST_DBPASSWD}" \
+    --env PHPBB_TEST_TABLE_PREFIX="${PHPBB_TEST_TABLE_PREFIX}" \
+    --volume ${WORKING_DIR}:/data \
     --workdir /data \
-    phpbb/php-ut-5.6-mysql php -d memory_limit=-1 phpBB/vendor/bin/phpunit --group __nogroup__ --log-junit build/logs/phpunit.xml
+    phpbb/php-ut-${php}-${db} php -d memory_limit=-1 phpBB/vendor/bin/phpunit --group __nogroup__ --log-junit build/logs/phpunit.xml
diff --git a/docker/scripts/utils/set-status.sh b/docker/scripts/utils/set-status.sh
index 625b24999b..94c3394bd8 100755
--- a/docker/scripts/utils/set-status.sh
+++ b/docker/scripts/utils/set-status.sh
@@ -6,6 +6,8 @@ status=$1
 description=$2
 step=$3
 
+env
+
 echo '---------------------'
 echo curl -H "Authorization: token ${GITHUB_TOKEN}" --request POST --data "{\"state\": \"${status}\", \"description\": \"${description}\", \"target_url\": \"${BUILD_RESULT_URL}\", \"context\": \"phpBB continuous integration - ${step}\"}" https://api.github.com/repos/phpbb/phpbb/statuses/${last_commit}
 echo '---------------------'