diff --git a/lib/phpunit/classes/util.php b/lib/phpunit/classes/util.php
index c3f0cafd527..c6e9e44d9c6 100644
--- a/lib/phpunit/classes/util.php
+++ b/lib/phpunit/classes/util.php
@@ -524,6 +524,7 @@ class phpunit_util extends testing_util {
             <testsuite name="@component@_testsuite">
               <directory suffix="_test.php">@dir@</directory>
               <exclude>@dir@/classes</exclude>
+              <exclude>@dir@/fixtures</exclude>
             </testsuite>
 
         EOF;
@@ -615,8 +616,9 @@ class phpunit_util extends testing_util {
         $template = <<<EOT
             <testsuites>
               <testsuite name="@component@_testsuite">
-                <directory suffix="_test.php">.</directory>
-                <exclude>./classes</exclude>
+                <directory suffix="_test.php">tests</directory>
+                <exclude>tests/classes</exclude>
+                <exclude>tests/fixtures</exclude>
               </testsuite>
             </testsuites>
           EOT;
@@ -625,7 +627,7 @@ class phpunit_util extends testing_util {
               <directory suffix=".php">.</directory>
             </include>
             <exclude>
-              <directory suffix="_test.php">.</directory>
+              <directory suffix="_test.php">tests</directory>
             </exclude>
         EOT;
 
diff --git a/lib/tests/fixtures/fixtures_not_tested_test.php b/lib/tests/fixtures/fixtures_not_tested_test.php
new file mode 100644
index 00000000000..e2c805cd34a
--- /dev/null
+++ b/lib/tests/fixtures/fixtures_not_tested_test.php
@@ -0,0 +1,38 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\fixtures;
+
+/**
+ * Test to ensure that fixtures are excluded from phpunit configuration.
+ *
+ * @package    core
+ * @category   phpunit
+ * @copyright  Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+final class fixtures_not_tested_test extends \advanced_testcase {
+    /**
+     * Ensure that test fixtures are not tested.
+     *
+     * This test deliberately fails, but it should never be included in a test run.
+     *
+     * If this test is failing, then something has broken the PHPUnit configuration.
+     */
+    public function test_fixture_are_not_included(): void {
+        $this->assertFalse(true);
+    }
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index de77041fcf2..c899720e4cc 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -36,47 +36,59 @@
     <testsuite name="core_phpunit_testsuite">
       <directory suffix="_test.php">lib/phpunit/tests</directory>
       <exclude>lib/phpunit/tests/classes</exclude>
+      <exclude>lib/phpunit/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_test_testsuite">
       <directory suffix="_test.php">lib/testing/tests</directory>
       <exclude>lib/testing/tests/classes</exclude>
+      <exclude>lib/testing/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_ddl_testsuite">
       <directory suffix="_test.php">lib/ddl/tests</directory>
       <exclude>lib/ddl/tests/classes</exclude>
+      <exclude>lib/ddl/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_dml_testsuite">
       <directory suffix="_test.php">lib/dml/tests</directory>
       <exclude>lib/dml/tests/classes</exclude>
+      <exclude>lib/dml/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_testsuite">
       <directory suffix="_test.php">lib/tests</directory>
       <exclude>lib/tests/classes</exclude>
+      <exclude>lib/tests/fixtures</exclude>
       <!-- <directory suffix="_test.php">lib/ajax/tests</directory> -->
     </testsuite>
     <testsuite name="core_external_testsuite">
       <directory suffix="_test.php">lib/external/tests</directory>
       <exclude>lib/external/tests/classes</exclude>
+      <exclude>lib/external/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_favourites_testsuite">
       <directory suffix="_test.php">favourites/tests</directory>
       <exclude>favourites/tests/classes</exclude>
+      <exclude>favourites/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_form_testsuite">
       <directory suffix="_test.php">lib/form/tests</directory>
       <exclude>lib/form/tests/classes</exclude>
+      <exclude>lib/form/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_files_testsuite">
       <directory suffix="_test.php">lib/filestorage/tests</directory>
       <directory suffix="_test.php">lib/filebrowser/tests</directory>
       <directory suffix="_test.php">files/tests</directory>
       <exclude>lib/filestorage/tests/classes</exclude>
+      <exclude>lib/filestorage/tests/fixtures</exclude>
       <exclude>lib/filebrowser/tests/classes</exclude>
+      <exclude>lib/filebrowser/tests/fixtures</exclude>
       <exclude>files/tests/classes</exclude>
+      <exclude>files/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_filter_testsuite">
       <directory suffix="_test.php">filter/tests</directory>
       <exclude>filter/tests/classes</exclude>
+      <exclude>filter/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_role_testsuite">
       <directory suffix="_test.php">admin/roles/tests</directory>
@@ -157,138 +169,172 @@
     <testsuite name="core_cache_testsuite">
       <directory suffix="_test.php">cache/tests</directory>
       <exclude>cache/tests/classes</exclude>
+      <exclude>cache/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_calendar_testsuite">
       <directory suffix="_test.php">calendar/tests</directory>
       <exclude>calendar/tests/classes</exclude>
+      <exclude>calendar/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_enrol_testsuite">
       <directory suffix="_test.php">enrol/tests</directory>
       <exclude>enrol/tests/classes</exclude>
+      <exclude>enrol/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_group_testsuite">
       <directory suffix="_test.php">group/tests</directory>
       <exclude>group/tests/classes</exclude>
+      <exclude>group/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_message_testsuite">
       <directory suffix="_test.php">message/tests</directory>
       <exclude>message/tests/classes</exclude>
+      <exclude>message/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_notes_testsuite">
       <directory suffix="_test.php">notes/tests</directory>
       <exclude>notes/tests/classes</exclude>
+      <exclude>notes/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_tag_testsuite">
       <directory suffix="_test.php">tag/tests</directory>
       <exclude>tag/tests/classes</exclude>
+      <exclude>tag/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_rating_testsuite">
       <directory suffix="_test.php">rating/tests</directory>
       <exclude>rating/tests/classes</exclude>
+      <exclude>rating/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_repository_testsuite">
       <directory suffix="_test.php">repository/tests</directory>
       <exclude>repository/tests/classes</exclude>
+      <exclude>repository/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_userkey_testsuite">
       <directory suffix="_test.php">lib/userkey/tests</directory>
       <exclude>lib/userkey/tests/classes</exclude>
+      <exclude>lib/userkey/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_user_testsuite">
       <directory suffix="_test.php">user/tests</directory>
       <exclude>user/tests/classes</exclude>
+      <exclude>user/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_webservice_testsuite">
       <directory suffix="_test.php">webservice/tests</directory>
       <exclude>webservice/tests/classes</exclude>
+      <exclude>webservice/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_mnet_testsuite">
       <directory suffix="_test.php">mnet/tests</directory>
       <exclude>mnet/tests/classes</exclude>
+      <exclude>mnet/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_completion_testsuite">
       <directory suffix="_test.php">completion/tests</directory>
       <exclude>completion/tests/classes</exclude>
+      <exclude>completion/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_comment_testsuite">
       <directory suffix="_test.php">comment/tests</directory>
       <exclude>comment/tests/classes</exclude>
+      <exclude>comment/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_search_testsuite">
       <directory suffix="_test.php">search/tests</directory>
       <exclude>search/tests/classes</exclude>
+      <exclude>search/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_competency_testsuite">
       <directory suffix="_test.php">competency/tests</directory>
       <exclude>competency/tests/classes</exclude>
+      <exclude>competency/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_my_testsuite">
       <directory suffix="_test.php">my/tests</directory>
       <exclude>my/tests/classes</exclude>
+      <exclude>my/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_auth_testsuite">
       <directory suffix="_test.php">auth/tests</directory>
       <exclude>auth/tests/classes</exclude>
+      <exclude>auth/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_block_testsuite">
       <directory suffix="_test.php">blocks/tests</directory>
       <exclude>blocks/tests/classes</exclude>
+      <exclude>blocks/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_login_testsuite">
       <directory suffix="_test.php">login/tests</directory>
       <exclude>login/tests/classes</exclude>
+      <exclude>login/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_plagiarism_testsuite">
       <directory suffix="_test.php">plagiarism/tests</directory>
       <exclude>plagiarism/tests/classes</exclude>
+      <exclude>plagiarism/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_portfolio_testsuite">
       <directory suffix="_test.php">portfolio/tests</directory>
       <exclude>portfolio/tests/classes</exclude>
+      <exclude>portfolio/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_editor_testsuite">
       <directory suffix="_test.php">lib/editor/tests</directory>
       <exclude>lib/editor/tests/classes</exclude>
+      <exclude>lib/editor/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_rss_testsuite">
       <directory suffix="_test.php">rss/tests</directory>
       <exclude>rss/tests/classes</exclude>
+      <exclude>rss/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_table_testsuite">
       <directory suffix="_test.php">lib/table/tests</directory>
       <exclude>lib/table/tests/classes</exclude>
+      <exclude>lib/table/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_h5p_testsuite">
       <directory suffix="_test.php">h5p/tests</directory>
       <exclude>h5p/tests/classes</exclude>
+      <exclude>h5p/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_xapi_testsuite">
       <directory suffix="_test.php">lib/xapi/tests</directory>
       <exclude>lib/xapi/tests/classes</exclude>
+      <exclude>lib/xapi/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_contentbank_testsuite">
       <directory suffix="_test.php">contentbank/tests</directory>
       <exclude>contentbank/tests/classes</exclude>
+      <exclude>contentbank/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_payment_testsuite">
       <directory suffix="_test.php">payment/tests</directory>
       <exclude>payment/tests/classes</exclude>
+      <exclude>payment/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_reportbuilder_testsuite">
       <directory suffix="_test.php">reportbuilder/tests</directory>
       <exclude>reportbuilder/tests/classes</exclude>
+      <exclude>reportbuilder/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_adminpresets_testsuite">
       <directory suffix="_test.php">admin/presets/tests</directory>
       <exclude>admin/presets/tests/classes</exclude>
+      <exclude>admin/presets/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_admin_testsuite">
       <directory suffix="_test.php">admin/tests</directory>
       <exclude>admin/tests/classes</exclude>
+      <exclude>admin/tests/fixtures</exclude>
     </testsuite>
     <testsuite name="core_communication_testsuite">
       <directory suffix="_test.php">communication/tests</directory>
       <exclude>communication/tests/classes</exclude>
+      <exclude>communication/tests/fixtures</exclude>
     </testsuite>
 
     <!--Plugin suites: use admin/tool/phpunit/cli/util.php to build phpunit.xml from