diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a198860..20851c75 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,8 +55,3 @@ jobs:
 
     - name: Test
       run: ./bin/test.sh
-      env:
-        PHP_VERSION: ${{ matrix.php-versions }}
-        GITHUB_WORKSPACE: ${{ github.workspace }}
-        AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
-        SECRET_ACCESS_KEY: ${{ secrets.SECRET_ACCESS_KEY }}
diff --git a/bin/test.sh b/bin/test.sh
index 0c87f66d..4a0d9278 100755
--- a/bin/test.sh
+++ b/bin/test.sh
@@ -5,8 +5,3 @@ composer install
 composer run lint
 composer run setup-local-tests
 composer run test
-
-if [[ '7.2' == $PHP_VERSION ]]; then
-    WP_SNAPSHOTS_DIR=$GITHIB_WORKSPACE/.wpsnapshots/ ./vendor/bin/wpsnapshots configure --aws_key=$AWS_ACCESS_KEY --aws_secret=$SECRET_ACCESS_KEY --user_name="wp-acceptance" --user_email=travis@10up.com 10up
-    composer run test:acceptance
-fi;
diff --git a/composer.json b/composer.json
index c11b0862..c4155af7 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,8 @@
 		"phpunit/phpunit": "^7.5",
 		"wp-coding-standards/wpcs": "^2.2",
 		"10up/wpacceptance": "dev-master",
-		"dealerdirect/phpcodesniffer-composer-installer": "dev-master"
+		"dealerdirect/phpcodesniffer-composer-installer": "dev-master",
+		"yoast/phpunit-polyfills": "^1.0.3"
 	},
 	"scripts": {
 		"test": "phpunit",
diff --git a/composer.lock b/composer.lock
index 4fdee7d8..e0a9057d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6b80d81da7351778f02bc3c729b05b98",
+    "content-hash": "bc250ea8850059e6e3adb7bbc96f569c",
     "packages": [
         {
             "name": "abraham/twitteroauth",
@@ -5449,6 +5449,68 @@
                 "wiki": "https://github.com/WordPress/WordPress-Coding-Standards/wiki"
             },
             "time": "2020-05-13T23:57:56+00:00"
+        },
+        {
+            "name": "yoast/phpunit-polyfills",
+            "version": "dev-develop",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
+                "reference": "b0571ffd2d5f0c926de8ec2c64415c89fa3c0262"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/b0571ffd2d5f0c926de8ec2c64415c89fa3c0262",
+                "reference": "b0571ffd2d5f0c926de8ec2c64415c89fa3c0262",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4",
+                "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
+            },
+            "require-dev": {
+                "yoast/yoastcs": "^2.2.1"
+            },
+            "default-branch": true,
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev",
+                    "dev-develop": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "phpunitpolyfills-autoload.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Team Yoast",
+                    "email": "support@yoast.com",
+                    "homepage": "https://yoast.com"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/Yoast/PHPUnit-Polyfills/graphs/contributors"
+                }
+            ],
+            "description": "Set of polyfills for changed PHPUnit functionality to allow for creating PHPUnit cross-version compatible tests",
+            "homepage": "https://github.com/Yoast/PHPUnit-Polyfills",
+            "keywords": [
+                "phpunit",
+                "polyfill",
+                "testing"
+            ],
+            "support": {
+                "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues",
+                "source": "https://github.com/Yoast/PHPUnit-Polyfills"
+            },
+            "time": "2022-02-23T16:56:11+00:00"
         }
     ],
     "aliases": [],
@@ -5461,5 +5523,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.1.0"
 }