diff --git a/admin/tool/monitor/tests/privacy_test.php b/admin/tool/monitor/tests/privacy_test.php
index 8993b7731ed..3d419c7e4d5 100644
--- a/admin/tool/monitor/tests/privacy_test.php
+++ b/admin/tool/monitor/tests/privacy_test.php
@@ -28,6 +28,7 @@ defined('MOODLE_INTERNAL') || die();
 use \tool_monitor\privacy\provider;
 use \core_privacy\local\request\approved_contextlist;
 use \core_privacy\local\request\approved_userlist;
+use \core_privacy\tests\provider_testcase;
 
 /**
  * Privacy test for the event monitor
@@ -37,7 +38,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 tool_monitor_privacy_testcase extends advanced_testcase {
+class tool_monitor_privacy_testcase extends provider_testcase {
 
     /**
      * Set up method.
diff --git a/search/engine/simpledb/tests/privacy_test.php b/search/engine/simpledb/tests/privacy_test.php
index 9bc7c2e7c99..f88830c6501 100644
--- a/search/engine/simpledb/tests/privacy_test.php
+++ b/search/engine/simpledb/tests/privacy_test.php
@@ -104,6 +104,9 @@ class privacy_model_testcase extends \core_privacy\tests\provider_testcase {
      * @return void
      */
     public function tearDown() {
+        // Call parent tearDown() first.
+        parent::tearDown();
+
         // For unit tests before PHP 7, teardown is called even on skip. So only do our teardown if we did setup.
         if ($this->generator) {
             // Moodle DML freaks out if we don't teardown the temp table after each run.