diff --git a/.travis.yml b/.travis.yml
index bf816aa..1e4695f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: php
 
 addons:
-  postgresql: "9.5"
+  postgresql: "9.6"
 
 services:
   - docker
@@ -19,14 +19,8 @@ env:
 
 matrix:
   include:
-    - php: 7.0
-      env: MOODLE_BRANCH=MOODLE_35_STABLE
-
-    - php: 7.0
-      env: MOODLE_BRANCH=MOODLE_36_STABLE
-
     - php: 7.1
-      env: MOODLE_BRANCH=MOODLE_37_STABLE
+      env: MOODLE_BRANCH=MOODLE_35_STABLE
 
     - php: 7.2
       env: MOODLE_BRANCH=MOODLE_38_STABLE
@@ -34,6 +28,9 @@ matrix:
     - php: 7.3
       env: MOODLE_BRANCH=MOODLE_39_STABLE
 
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_310_STABLE
+
 before_install:
   - phpenv config-rm xdebug.ini
   - cd ../..
diff --git a/README.md b/README.md
index d3408c3..0b4c1a3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Cohort role synchronization [![Build Status](https://travis-ci.org/paulholden/moodle-local_cohortrole.svg?branch=master)](https://travis-ci.org/paulholden/moodle-local_cohortrole)
+# Cohort role synchronization [![Build Status](https://travis-ci.com/paulholden/moodle-local_cohortrole.svg?branch=master)](https://travis-ci.com/paulholden/moodle-local_cohortrole)
 
 ## Requirements
 
diff --git a/tests/observers_test.php b/tests/observers_test.php
index 1f45b0d..85f7ab5 100644
--- a/tests/observers_test.php
+++ b/tests/observers_test.php
@@ -20,11 +20,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->dirroot . '/cohort/lib.php');
-
 /**
  * Unit tests for event observers
  *
@@ -40,12 +35,19 @@ class local_cohortrole_observers_testcase extends advanced_testcase {
     /** @var \local_cohortrole\persistent $persistent. */
     protected $persistent;
 
+    /**
+     * Load required test libraries
+     */
+    public static function setUpBeforeClass(): void {
+        global $CFG;
+
+        require_once("{$CFG->dirroot}/cohort/lib.php");
+    }
+
     /**
      * Test setup
-     *
-     * @return void
      */
-    protected function setUp() {
+    protected function setUp(): void {
         $this->resetAfterTest(true);
 
         // Create test role/cohort.
diff --git a/tests/privacy_test.php b/tests/privacy_test.php
index 1b82585..bbec147 100644
--- a/tests/privacy_test.php
+++ b/tests/privacy_test.php
@@ -20,8 +20,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 use core_privacy\local\request\userlist;
 use core_privacy\local\request\writer;
 use core_privacy\tests\provider_testcase;
@@ -50,7 +48,7 @@ class local_cohortrole_privacy_testcase extends provider_testcase {
      *
      * @return void
      */
-    protected function setUp() {
+    protected function setUp(): void {
         $this->resetAfterTest(true);
 
         // Create test user.
diff --git a/version.php b/version.php
index 503811b..064b0d8 100644
--- a/version.php
+++ b/version.php
@@ -23,7 +23,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'local_cohortrole';
-$plugin->release   = '3.2';
-$plugin->version   = 2020061800;
+$plugin->release   = '3.3';
+$plugin->version   = 2020110900;
 $plugin->requires  = 2018051703; // Moodle 3.5.3 onwards.
 $plugin->maturity  = MATURITY_STABLE;