diff --git a/docker/scripts/jobs/functional-tests.sh b/docker/scripts/jobs/functional-tests.sh
new file mode 100755
index 0000000000..de80e68576
--- /dev/null
+++ b/docker/scripts/jobs/functional-tests.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+pwd=$(dirname "$0")
+
+db=$1
+php=$2
+
+. ${pwd}/../db/${db}.sh
+
+start_db
+
+docker run \
+    --env TEST_UID=$(id -u) \
+    --env TEST_GID=$(id -g) \
+    ${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}" \
+    --env PHPBB_FUNCTIONAL_URL="http://localhost/" \
+    --volume ${WORKING_DIR}:/data \
+    --workdir /data \
+
+    phpbb/php-ft-${php}-${db}${IMAGES_TAG} php -d memory_limit=-1 phpBB/vendor/bin/phpunit --group functional --log-junit build/logs/phpunit.xml
diff --git a/docker/scripts/jobs/unit-tests.sh b/docker/scripts/jobs/unit-tests.sh
index 728de53143..ff65a0344d 100755
--- a/docker/scripts/jobs/unit-tests.sh
+++ b/docker/scripts/jobs/unit-tests.sh
@@ -21,4 +21,4 @@ docker run \
     --env PHPBB_TEST_TABLE_PREFIX="${PHPBB_TEST_TABLE_PREFIX}" \
     --volume ${WORKING_DIR}:/data \
     --workdir /data \
-    phpbb/php-ut-${php}-${db} php -d memory_limit=-1 phpBB/vendor/bin/phpunit --group __nogroup__ --log-junit build/logs/phpunit.xml
+    phpbb/php-ut-${php}-${db}${IMAGES_TAG} php -d memory_limit=-1 phpBB/vendor/bin/phpunit --group __nogroup__ --log-junit build/logs/phpunit.xml