diff --git a/.woodpecker/test.yml b/.woodpecker/functional-tests.yml
similarity index 69%
rename from .woodpecker/test.yml
rename to .woodpecker/functional-tests.yml
index 1315875..e6ee064 100644
--- a/.woodpecker/test.yml
+++ b/.woodpecker/functional-tests.yml
@@ -3,12 +3,19 @@ workspace:
   path: package
 
 matrix:
-  FLOW_VERSION:
-    - 6.3
+  include:
+    - FLOW_VERSION: 6.3
+      PHP_VERSION: 7.4
+    - FLOW_VERSION: 7.3
+      PHP_VERSION: 7.4
+    - FLOW_VERSION: 7.3
+      PHP_VERSION: 8.2
+    - FLOW_VERSION: 8.2
+      PHP_VERSION: 8.2
 
 pipeline:
   functional-tests:
-    image: thecodingmachine/php:7.4-v4-cli
+    image: thecodingmachine/php:${PHP_VERSION}-v4-cli
     environment:
       # Enable the PDO_SQLITE extension
       - "PHP_EXTENSION_PDO_SQLITE=1"
@@ -20,6 +27,6 @@ pipeline:
       - "cd $NEOS_BUILD_DIR"
       - "composer create-project --no-install neos/flow-base-distribution:^$FLOW_VERSION ."
       - "composer config repositories.repo-name path /woodpecker/package"
-      - "composer remove --dev neos/behat"
+      - "composer remove --dev --no-update neos/behat || composer remove --no-update neos/behat"
       - "composer require digicomp/settingvalidator:@dev"
       - "bin/phpunit --configuration Build/BuildEssentials/PhpUnit/FunctionalTests.xml Packages/Application/DigiComp.SettingValidator/Tests/Functional"
diff --git a/composer.json b/composer.json
index db62c95..7ecf1e8 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "Just a Neos\\Flow Validator resolving other Validators with Configuration/Validation.yaml",
     "type": "neos-package",
     "require": {
-        "neos/flow": "^6.3.5",
+        "neos/flow": "^6.3.5 | ^7.0 | ^8.0",
         "php": ">=7.4"
     },
     "require-dev": {