diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5a8aa5c..f439ed7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php: [ '7.2', '7.3', '7.4' ]
+        php: [ '7.2', '7.3', '7.4', '8.0' ]
         minMax: [ 'composerInstallMin', 'composerInstallMax' ]
     steps:
       - name: Checkout
diff --git a/Build/testing-docker/docker-compose.yml b/Build/testing-docker/docker-compose.yml
index 0a79f53..66388ff 100644
--- a/Build/testing-docker/docker-compose.yml
+++ b/Build/testing-docker/docker-compose.yml
@@ -52,6 +52,14 @@ services:
         if [ ${SCRIPT_VERBOSE} -eq 1 ]; then
           set -x
         fi
+        if [ ${PHP_VERSION} == "8.0" ]; then
+          composer req --dev typo3/cms-core:"dev-master" \
+            typo3/cms-backend:"dev-master" \
+            typo3/cms-frontend:"dev-master" \
+            typo3/cms-extbase:"dev-master" \
+            typo3/cms-fluid:"dev-master" \
+            typo3/cms-recordlist:"dev-master"
+        fi
         composer config --unset platform.php;
         composer update --no-progress --no-interaction;
         composer dumpautoload;
@@ -71,6 +79,14 @@ services:
         if [ ${SCRIPT_VERBOSE} -eq 1 ]; then
           set -x
         fi
+        if [ ${PHP_VERSION} == "8.0" ]; then
+          composer req --dev typo3/cms-core:"dev-master" \
+            typo3/cms-backend:"dev-master" \
+            typo3/cms-frontend:"dev-master" \
+            typo3/cms-extbase:"dev-master" \
+            typo3/cms-fluid:"dev-master" \
+            typo3/cms-recordlist:"dev-master"
+        fi
         composer config platform.php ${PHP_VERSION}.0;
         composer update --prefer-lowest --no-progress --no-interaction;
         composer dumpautoload;