diff --git a/.github/workflows/phpunit-tests-run.yml b/.github/workflows/phpunit-tests-run.yml
index ceaa11d161..843a950481 100644
--- a/.github/workflows/phpunit-tests-run.yml
+++ b/.github/workflows/phpunit-tests-run.yml
@@ -24,7 +24,7 @@ on:
         description: 'Database version'
         required: false
         type: 'string'
-        default: '5.7'
+        default: '8.0'
       multisite:
         description: 'Whether to run tests as multisite'
         required: false
@@ -41,7 +41,7 @@ on:
         type: 'string'
         default: 'phpunit.xml.dist'
       report:
-        description: 'Whether to report results to WordPress.org hosting tests'
+        description: 'Whether to report results to WordPress.org Hosting Tests'
         required: false
         type: 'boolean'
         default: false
@@ -51,6 +51,7 @@ env:
   LOCAL_DB_VERSION: ${{ inputs.db-version }}
   LOCAL_PHP_MEMCACHED: ${{ inputs.memcached }}
   PHPUNIT_CONFIG: ${{ inputs.phpunit-config }}
+  PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
 
 jobs:
   # Runs the PHPUnit tests for WordPress.
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 88bab87f6f..3b616e1c48 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -30,17 +30,13 @@ concurrency:
 # Any needed permissions should be configured at the job level.
 permissions: {}
 
-env:
-  PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: ${{ true }}
-  LOCAL_PHP_MEMCACHED: ${{ false }}
-
 jobs:
   #
   # Creates a PHPUnit test job for each PHP/MySQL combination.
   #
   test-with-mysql:
     name: PHP ${{ matrix.php }}
-    uses: desrosj/wordpress-develop/.github/workflows/phpunit-tests-run.yml@expanded-db-testing-callable-workflow
+    uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -68,7 +64,7 @@ jobs:
             db-version: '5.7'
             multisite: true
             memcached: true
-          # Report the results of the PHP 7.4 without memcached job.
+          # Report test results to the Host Test Results.
           - os: ubuntu-latest
             php: '7.4'
             db-type: 'mysql'
@@ -91,7 +87,7 @@ jobs:
   #
   test-with-mariadb:
     name: PHP ${{ matrix.php }}
-    uses: desrosj/wordpress-develop/.github/workflows/phpunit-tests-run.yml@expanded-db-testing-callable-workflow
+    uses: WordPress/wordpress-develop/.github/workflows/phpunit-tests-run.yml@trunk
     permissions:
       contents: read
     if: ${{ github.repository == 'WordPress/wordpress-develop' || github.event_name == 'pull_request' }}
@@ -104,7 +100,6 @@ jobs:
         db-version: [ '10.4', '10.6', '10.11', '11.0' ]
         multisite: [ false, true ]
         memcached: [ false ]
-        report: [ false ]
 
         include:
         # Include jobs for PHP 7.4 with memcached.
@@ -114,14 +109,12 @@ jobs:
           db-version: '11.0'
           multisite: false
           memcached: true
-          report: false
         - os: ubuntu-latest
           php: '7.4'
           db-type: 'mariadb'
           db-version: '11.0'
           multisite: true
           memcached: true
-          report: false
     with:
       os: ${{ matrix.os }}
       php: ${{ matrix.php }}
@@ -130,7 +123,7 @@ jobs:
       multisite: ${{ matrix.multisite }}
       memcached: ${{ matrix.memcached }}
       phpunit-config: ${{ matrix.multisite && 'tests/phpunit/multisite.xml' || 'phpunit.xml.dist' }}
-      report: ${{ matrix.report }}
+      report: ${{ matrix.report || false }}
 
   slack-notifications:
     name: Slack Notifications
@@ -160,7 +153,8 @@ jobs:
       github.event_name != 'pull_request' &&
       github.run_attempt < 2 &&
       (
-        needs.test-php.result == 'cancelled' || needs.test-php.result == 'failure'
+        needs.test-with-mysql.result == 'cancelled' || needs.test-with-mysql.result == 'failure' ||
+        needs.test-with-mariadb.result == 'cancelled' || needs.test-with-mariadb.result == 'failure'
       )
 
     steps: