diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php
index e3b25cb8d46..3a7a42cb774 100644
--- a/lib/tests/moodlelib_test.php
+++ b/lib/tests/moodlelib_test.php
@@ -28,8 +28,6 @@ defined('MOODLE_INTERNAL') || die();
 
 class core_moodlelib_testcase extends advanced_testcase {
 
-    public static $includecoverage = array('lib/moodlelib.php');
-
     /**
      * Define a local decimal separator.
      *
diff --git a/mod/quiz/accessrule/securewindow/tests/rule_test.php b/mod/quiz/accessrule/securewindow/tests/rule_test.php
index 3d19cbbc4ee..0b0c3e3c60f 100644
--- a/mod/quiz/accessrule/securewindow/tests/rule_test.php
+++ b/mod/quiz/accessrule/securewindow/tests/rule_test.php
@@ -31,10 +31,11 @@ require_once($CFG->dirroot . '/mod/quiz/accessrule/securewindow/rule.php');
  * @package    quizaccess_securewindow
  * @copyright  2008 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ *
+ * @covers \quiz_access_rule_base
+ * @covers \quizaccess_securewindow
  */
 class rule_test extends \basic_testcase {
-    public static $includecoverage = array('mod/quiz/accessrule/securewindow/rule.php');
-
     // Nothing very testable in this class, just test that it obeys the general access rule contact.
     public function test_securewindow_access_rule() {
         $quiz = new \stdClass();
diff --git a/question/type/calculated/tests/questiontype_test.php b/question/type/calculated/tests/questiontype_test.php
index 2d7952717b6..d4c437574e8 100644
--- a/question/type/calculated/tests/questiontype_test.php
+++ b/question/type/calculated/tests/questiontype_test.php
@@ -35,13 +35,11 @@ require_once($CFG->dirroot . '/question/type/calculated/tests/helper.php');
  *
  * @copyright  2012 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ *
+ * @covers \question_type
+ * @covers \qtype_calculated
  */
 class qtype_calculated_test extends advanced_testcase {
-    public static $includecoverage = array(
-        'question/type/questiontypebase.php',
-        'question/type/calculated/questiontype.php'
-    );
-
     protected $tolerance = 0.00000001;
     protected $qtype;
 
diff --git a/question/type/calculatedsimple/tests/questiontype_test.php b/question/type/calculatedsimple/tests/questiontype_test.php
index 73d9c39b97d..26b824b5c32 100644
--- a/question/type/calculatedsimple/tests/questiontype_test.php
+++ b/question/type/calculatedsimple/tests/questiontype_test.php
@@ -37,15 +37,16 @@ require_once($CFG->dirroot . '/question/type/calculatedsimple/edit_calculatedsim
  *
  * @copyright  2007 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ *
+ * @covers \question_type
+ * @covers \qtype_calculatedsimple
+ * @covers \question_wizard_form
+ * @covers \question_edit_form
+ * @covers \qtype_calculated_edit_form
+ * @covers \qtype_calculatedsimple_edit_form
+ *
  */
 class qtype_calculatedsimple_test extends advanced_testcase {
-    public static $includecoverage = array(
-        'question/type/questiontypebase.php',
-        'question/type/calculatedsimple/questiontype.php',
-        'question/type/edit_question_form.php',
-        'question/type/calculatedsimple/edit_calculatedsimple_form.php'
-    );
-
     protected $qtype;
 
     protected function setUp(): void {
diff --git a/question/type/numerical/tests/questiontype_test.php b/question/type/numerical/tests/questiontype_test.php
index 273cecb8a73..134f5c928c4 100644
--- a/question/type/numerical/tests/questiontype_test.php
+++ b/question/type/numerical/tests/questiontype_test.php
@@ -37,13 +37,11 @@ require_once($CFG->dirroot . '/question/type/numerical/edit_numerical_form.php')
  *
  * @copyright  2006 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ *
+ * @covers \question_type
+ * @covers \qtype_numerical
  */
 class qtype_numerical_test extends advanced_testcase {
-    public static $includecoverage = array(
-        'question/type/questiontypebase.php',
-        'question/type/numerical/questiontype.php'
-    );
-
     protected $tolerance = 0.00000001;
     protected $qtype;
 
diff --git a/question/type/shortanswer/tests/questiontype_test.php b/question/type/shortanswer/tests/questiontype_test.php
index 5298704af5a..3945c746e8c 100644
--- a/question/type/shortanswer/tests/questiontype_test.php
+++ b/question/type/shortanswer/tests/questiontype_test.php
@@ -36,13 +36,11 @@ require_once($CFG->dirroot . '/question/type/shortanswer/edit_shortanswer_form.p
  *
  * @copyright  2007 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ *
+ * @covers \question_type
+ * @covers \qtype_shortanswer
  */
 class qtype_shortanswer_test extends advanced_testcase {
-    public static $includecoverage = array(
-        'question/type/questiontypebase.php',
-        'question/type/shortanswer/questiontype.php',
-    );
-
     protected $qtype;
 
     protected function setUp(): void {
diff --git a/question/type/tests/questiontype_test.php b/question/type/tests/questiontype_test.php
index 6459629b5d3..d6a4f456edd 100644
--- a/question/type/tests/questiontype_test.php
+++ b/question/type/tests/questiontype_test.php
@@ -35,10 +35,10 @@ require_once($CFG->dirroot . '/question/type/questiontypebase.php');
  *
  * @copyright  2008 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ *
+ * @covers \question_type
  */
 class question_type_testcase extends advanced_testcase {
-    public static $includecoverage = array('question/type/questiontypebase.php');
-
     public function test_save_question_name() {
         $this->resetAfterTest();