diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85cc9a3f..986cc3b5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,13 +78,6 @@ jobs:
           - php: 7.2
             moodle-branch: MOODLE_35_STABLE
             database: pgsql
-
-          - php: 7.1
-            moodle-branch: MOODLE_38_STABLE
-            database: pgsql
-          - php: 7.1
-            moodle-branch: MOODLE_37_STABLE
-            database: mariadb
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2
diff --git a/.travis.yml b/.travis.yml
index bae48202..bcaace64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,11 +51,6 @@ jobs:
     - php: 7.2
       env: MOODLE_BRANCH=MOODLE_35_STABLE  DB=pgsql
 
-    - php: 7.1
-      env: MOODLE_BRANCH=MOODLE_38_STABLE  DB=pgsql
-    - php: 7.1
-      env: MOODLE_BRANCH=MOODLE_37_STABLE  DB=mysqli
-
     # Cannot test with Moodle 3.2 and 3.3 any more because the new composer 2
     # does require all components to be named properly (case-sensitively) and
     # those branches have phpunit/Dbunit, failing. See MDL-64725.
@@ -91,5 +86,5 @@ script:
   - moodle-plugin-ci mustache
   - moodle-plugin-ci grunt
   - moodle-plugin-ci phpdoc
-  - moodle-plugin-ci phpunit --coverage-text
+  - moodle-plugin-ci phpunit
   - moodle-plugin-ci behat
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
index 0b6e3fe3..4f2a85ed 100644
--- a/classes/privacy/provider.php
+++ b/classes/privacy/provider.php
@@ -34,16 +34,13 @@
  */
 class provider implements \core_privacy\local\metadata\null_provider {
 
-    // To provide php 5.6 (33_STABLE) and up support.
-    use \core_privacy\local\legacy_polyfill;
-
     /**
      * Get the language string identifier with the component's language
      * file to explain why this plugin stores no data.
      *
      * @return  string
      */
-    public static function _get_reason() {
+    public static function get_reason(): string {
         return 'privacy:metadata';
     }
 }
diff --git a/tests/coverage.php b/tests/coverage.php
index 98fd662b..35b1697d 100644
--- a/tests/coverage.php
+++ b/tests/coverage.php
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Coverage information for the local_codechecker plugin.
  *
@@ -24,6 +22,12 @@
  * @copyright  2021 onwards Eloy Lafuente (stronk7) {@link https://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Anonymous phpunit_coverage_info returning the areas to include and exclude.
+ */
 return new class extends phpunit_coverage_info {
     /** @var array The list of folders relative to the plugin root to include in coverage generation. */
     protected $includelistfolders = [