diff --git a/mod/assignment/tests/privacy_test.php b/mod/assignment/tests/privacy_test.php
index 18dbb41af2f..97c0f90872d 100644
--- a/mod/assignment/tests/privacy_test.php
+++ b/mod/assignment/tests/privacy_test.php
@@ -28,7 +28,6 @@ defined('MOODLE_INTERNAL') || die();
 require_once(__DIR__ . '/../lib.php');
 
 use \mod_assignment\privacy\provider;
-use \core_privacy\local\metadata\collection;
 use \core_privacy\local\request\approved_contextlist;
 use \core_privacy\local\request\transform;
 use \core_privacy\local\request\writer;
@@ -42,7 +41,7 @@ use \core_privacy\tests\provider_testcase;
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_assignment_privacy_testcase extends advanced_testcase {
+class mod_assignment_privacy_testcase extends provider_testcase {
 
     /**
      * @var int array   Array of test student ids associated for Course 1.
diff --git a/mod/quiz/accessrule/seb/tests/privacy_provider_test.php b/mod/quiz/accessrule/seb/tests/privacy_provider_test.php
index f73a49f0396..d81fd3c2b34 100644
--- a/mod/quiz/accessrule/seb/tests/privacy_provider_test.php
+++ b/mod/quiz/accessrule/seb/tests/privacy_provider_test.php
@@ -27,6 +27,7 @@ use core_privacy\local\request\approved_userlist;
 use core_privacy\local\request\userlist;
 use core_privacy\local\request\writer;
 use core_privacy\tests\request\approved_contextlist;
+use core_privacy\tests\provider_testcase;
 use quizaccess_seb\privacy\provider;
 use quizaccess_seb\quiz_settings;
 
@@ -40,7 +41,7 @@ require_once(__DIR__ . '/test_helper_trait.php');
  * @copyright  2020 Catalyst IT
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class quizaccess_seb_provider_testcase extends advanced_testcase {
+class quizaccess_seb_provider_testcase extends provider_testcase {
     use quizaccess_seb_test_helper_trait;
 
     /**
diff --git a/mod/workshop/form/accumulative/tests/privacy_provider_test.php b/mod/workshop/form/accumulative/tests/privacy_provider_test.php
index d4face42520..9029b8061e4 100644
--- a/mod/workshop/form/accumulative/tests/privacy_provider_test.php
+++ b/mod/workshop/form/accumulative/tests/privacy_provider_test.php
@@ -28,6 +28,7 @@ defined('MOODLE_INTERNAL') || die();
 global $CFG;
 
 use core_privacy\local\request\writer;
+use core_privacy\tests\provider_testcase;
 
 /**
  * Unit tests for the privacy API implementation.
@@ -35,7 +36,7 @@ use core_privacy\local\request\writer;
  * @copyright 2018 David Mudrák <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class workshopform_accumulative_privacy_provider_testcase extends advanced_testcase {
+class workshopform_accumulative_privacy_provider_testcase extends provider_testcase {
 
     /**
      * Test {@link workshopform_accumulative\privacy\provider::export_assessment_form()} implementation.
diff --git a/mod/workshop/form/comments/tests/privacy_provider_test.php b/mod/workshop/form/comments/tests/privacy_provider_test.php
index ee78e297be7..91008b1613e 100644
--- a/mod/workshop/form/comments/tests/privacy_provider_test.php
+++ b/mod/workshop/form/comments/tests/privacy_provider_test.php
@@ -28,6 +28,7 @@ defined('MOODLE_INTERNAL') || die();
 global $CFG;
 
 use core_privacy\local\request\writer;
+use core_privacy\tests\provider_testcase;
 
 /**
  * Unit tests for the privacy API implementation.
@@ -35,7 +36,7 @@ use core_privacy\local\request\writer;
  * @copyright 2018 David Mudrák <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class workshopform_comments_privacy_provider_testcase extends advanced_testcase {
+class workshopform_comments_privacy_provider_testcase extends provider_testcase {
 
     /**
      * Test {@link workshopform_comments\privacy\provider::export_assessment_form()} implementation.
diff --git a/mod/workshop/form/numerrors/tests/privacy_provider_test.php b/mod/workshop/form/numerrors/tests/privacy_provider_test.php
index bb5abd57d9f..76541580bff 100644
--- a/mod/workshop/form/numerrors/tests/privacy_provider_test.php
+++ b/mod/workshop/form/numerrors/tests/privacy_provider_test.php
@@ -28,6 +28,7 @@ defined('MOODLE_INTERNAL') || die();
 global $CFG;
 
 use core_privacy\local\request\writer;
+use core_privacy\tests\provider_testcase;
 
 /**
  * Unit tests for the privacy API implementation.
@@ -35,7 +36,7 @@ use core_privacy\local\request\writer;
  * @copyright 2018 David Mudrák <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class workshopform_numerrors_privacy_provider_testcase extends advanced_testcase {
+class workshopform_numerrors_privacy_provider_testcase extends provider_testcase {
 
     /**
      * Test {@link workshopform_numerrors\privacy\provider::export_assessment_form()} implementation.
diff --git a/mod/workshop/form/rubric/tests/privacy_provider_test.php b/mod/workshop/form/rubric/tests/privacy_provider_test.php
index f3a979590da..28807f94f73 100644
--- a/mod/workshop/form/rubric/tests/privacy_provider_test.php
+++ b/mod/workshop/form/rubric/tests/privacy_provider_test.php
@@ -28,6 +28,7 @@ defined('MOODLE_INTERNAL') || die();
 global $CFG;
 
 use core_privacy\local\request\writer;
+use core_privacy\tests\provider_testcase;
 
 /**
  * Unit tests for the privacy API implementation.
@@ -35,7 +36,7 @@ use core_privacy\local\request\writer;
  * @copyright 2018 David Mudrák <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class workshopform_rubric_privacy_provider_testcase extends advanced_testcase {
+class workshopform_rubric_privacy_provider_testcase extends provider_testcase {
 
     /**
      * Test {@link workshopform_rubric\privacy\provider::export_assessment_form()} implementation.
diff --git a/mod/workshop/tests/privacy_provider_test.php b/mod/workshop/tests/privacy_provider_test.php
index fccbbb4240d..f194474dea4 100644
--- a/mod/workshop/tests/privacy_provider_test.php
+++ b/mod/workshop/tests/privacy_provider_test.php
@@ -28,6 +28,7 @@ defined('MOODLE_INTERNAL') || die();
 global $CFG;
 
 use core_privacy\local\request\writer;
+use core_privacy\tests\provider_testcase;
 
 /**
  * Unit tests for the privacy API implementation.
@@ -35,7 +36,7 @@ use core_privacy\local\request\writer;
  * @copyright 2018 David Mudrák <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_workshop_privacy_provider_testcase extends advanced_testcase {
+class mod_workshop_privacy_provider_testcase extends provider_testcase {
 
     /** @var testing_data_generator */
     protected $generator;
diff --git a/report/stats/tests/privacy_test.php b/report/stats/tests/privacy_test.php
index b79607c7315..1c1863f8801 100644
--- a/report/stats/tests/privacy_test.php
+++ b/report/stats/tests/privacy_test.php
@@ -22,10 +22,9 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 use \report_stats\privacy\provider;
 use \core_privacy\local\request\approved_userlist;
+use \core_privacy\tests\provider_testcase;
 
 /**
  * Class report_stats_privacy_testcase
@@ -34,7 +33,7 @@ use \core_privacy\local\request\approved_userlist;
  * @copyright  2018 Adrian Greeve <adriangreeve.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
  */
-class report_stats_privacy_testcase extends advanced_testcase {
+class report_stats_privacy_testcase extends provider_testcase {
 
     /**
      * Convenience function to create stats.