diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 45493245..e3dc5b26 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [7.4, 7.3, 7.2]
+        php: [8.0, 7.4, 7.3]
         dependency-version: [prefer-lowest, prefer-stable]
 
     name: P${{ matrix.php }} - ${{ matrix.dependency-version }}
@@ -33,7 +33,7 @@ jobs:
       with:
         php-version: ${{ matrix.php }}
         coverage: none
-        tools: composer
+        tools: composer:v2
 
     - name: Install dependencies
       run: |
diff --git a/composer.json b/composer.json
index 241d1793..191fb972 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
         }
     ],
     "require": {
-        "php": "^7.2|^8.0",
-        "omnipay/common": "^3",
+        "php": "^7.3|^8.0",
+        "omnipay/common": "^3.1",
         "php-http/discovery": "^1.12",
         "php-http/guzzle7-adapter": "^0.1"
     },
@@ -34,7 +34,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev"
+            "dev-master": "3.2.x-dev"
         }
     },
     "scripts": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d212d94e..1347f357 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         backupGlobals="false"
          backupStaticAttributes="false"
          bootstrap="vendor/autoload.php"
          colors="true"
@@ -8,15 +9,15 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false">
-    <testsuites>
-        <testsuite name="Omnipay Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
\ No newline at end of file
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Omnipay Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/tests/OmnipayTest.php b/tests/OmnipayTest.php
index d51fc0b5..766ce5d1 100644
--- a/tests/OmnipayTest.php
+++ b/tests/OmnipayTest.php
@@ -7,7 +7,7 @@
 
 class OmnipayTest extends TestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         Omnipay::setFactory(null);