diff --git a/.github/workflows/end-to-end-tests.yml b/.github/workflows/end-to-end-tests.yml
index b7d60a1567920..1900c5391b7d9 100644
--- a/.github/workflows/end-to-end-tests.yml
+++ b/.github/workflows/end-to-end-tests.yml
@@ -31,7 +31,7 @@ on:
       - 'tools/webpack/**'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
-      # This files affect the e2e tests. Changes could affect the outcome.
+      # These files affect the e2e tests. Changes could affect the outcome.
       - 'tests/e2e/**'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/end-to-end-tests.yml'
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 43970724574ae..d2c9aa2316c7c 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -30,7 +30,7 @@ on:
       - 'tools/webpack/**'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
-      # This files affect the performance tests. Changes could affect the outcome.
+      # These files affect the performance tests. Changes could affect the outcome.
       - 'tests/performance/**'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/performance.yml'
diff --git a/.github/workflows/phpunit-tests.yml b/.github/workflows/phpunit-tests.yml
index 420506d42265c..75389705a1222 100644
--- a/.github/workflows/phpunit-tests.yml
+++ b/.github/workflows/phpunit-tests.yml
@@ -30,8 +30,9 @@ on:
       - 'Gruntfile.js'
       # These files configure Composer. Changes could affect the outcome.
       - 'composer.*'
-      # This files affect the phpunit tests. Changes could affect the outcome.
+      # These files affect the phpunit tests. Changes could affect the outcome.
       - 'tests/phpunit/**'
+      - 'phpunit.xml.dist'
       # Confirm any changes to relevant workflow files.
       - '.github/workflows/phpunit-tests.yml'
       - '.github/workflows/reusable-phpunit-tests-*.yml'
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ddbe4bd080ce1..4b5b0d3ded110 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -6,6 +6,7 @@
 		colors="true"
 		beStrictAboutTestsThatDoNotTestAnything="true"
 		beStrictAboutOutputDuringTests="true"
+		failOnRisky="true"
 		convertErrorsToExceptions="true"
 		convertWarningsToExceptions="true"
 		convertNoticesToExceptions="true"
diff --git a/tests/phpunit/multisite.xml b/tests/phpunit/multisite.xml
index 00154eb0170b0..b9b2231dab94d 100644
--- a/tests/phpunit/multisite.xml
+++ b/tests/phpunit/multisite.xml
@@ -6,6 +6,7 @@
 		colors="true"
 		beStrictAboutTestsThatDoNotTestAnything="true"
 		beStrictAboutOutputDuringTests="true"
+		failOnRisky="true"
 		convertErrorsToExceptions="true"
 		convertWarningsToExceptions="true"
 		convertNoticesToExceptions="true"