diff --git a/.travis.yml b/.travis.yml
index 6a8df8a..80ad074 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,71 +4,113 @@ os: linux
 
 addons:
   firefox: "47.0.1"
-  postgresql: "9.5"
-  apt:
-    packages:
-      - openjdk-8-jre-headless
 
 cache:
   directories:
     - $HOME/.composer/cache
     - $HOME/.npm
-
-php:
- - 7.0
- - 7.1
- - 7.2
- - 7.3
+    - $HOME/.nvm
 
 before_install:
   - phpenv config-rm xdebug.ini
-  - nvm install 8.9
-  - nvm use 8.9
+  - if [ -z $NODE ]; then
+      export NODE=14;
+    fi
+  - nvm install $NODE
+  - nvm use $NODE
   - cd ../..
-  - composer create-project -n --no-dev --prefer-dist blackboard-open-source/moodle-plugin-ci ci ^2
+  - composer create-project -n --no-dev --prefer-dist moodlerooms/moodle-plugin-ci ci ^2
   - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
+  - export IGNORE_PATHS=moodle/tests/fixtures,moodle/Sniffs
+  - export BEHAT=yes
 
 install:
   - moodle-plugin-ci install
 
 services:
  - mysql
-
-env:
-  jobs:
-    - DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE
-    - DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
-    - DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE
-    - DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
-    - DB=pgsql MOODLE_BRANCH=master
-    - DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE
-    - DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
-    - DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE
-    - DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
-    - DB=mysqli MOODLE_BRANCH=master
+ - postgresql
 
 jobs:
- exclude:
-  - php: 7.3
-    env: DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE
-  - php: 7.3
-    env: DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE
-  - php: 7.3
-    env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE
-  - php: 7.3
-    env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE
-  - php: 7.0
-    env: DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE
-  - php: 7.0
-    env: DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE
-  - php: 7.0
-    env: DB=pgsql MOODLE_BRANCH=master
-  - php: 7.0
-    env: DB=mysqli MOODLE_BRANCH=master
-  - php: 7.1
-    env: DB=pgsql MOODLE_BRANCH=master
-  - php: 7.1
-    env: DB=mysqli MOODLE_BRANCH=master
+  include:
+    - php: 7.4
+      env: MOODLE_BRANCH=master           DB=pgsql
+    - php: 7.4
+      env: MOODLE_BRANCH=master           DB=mysqli
+    - php: 7.4
+      env: MOODLE_BRANCH=MOODLE_39_STABLE DB=pgsql
+    - php: 7.4
+      env: MOODLE_BRANCH=MOODLE_39_STABLE DB=mysqli
+    - php: 7.4
+      env: MOODLE_BRANCH=MOODLE_38_STABLE DB=pgsql
+    - php: 7.4
+      env: MOODLE_BRANCH=MOODLE_38_STABLE DB=mysqli
+
+    - php: 7.3
+      env: MOODLE_BRANCH=master           DB=pgsql
+    - php: 7.3
+      env: MOODLE_BRANCH=master           DB=mysqli
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_39_STABLE DB=pgsql
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_39_STABLE DB=mysqli
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_38_STABLE DB=pgsql
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_38_STABLE DB=mysqli
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_37_STABLE DB=pgsql
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_37_STABLE DB=mysqli
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql NODE=8
+    - php: 7.3
+      env: MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli NODE=8
+
+    - php: 7.2
+      env: MOODLE_BRANCH=master           DB=pgsql
+    - php: 7.2
+      env: MOODLE_BRANCH=master           DB=mysqli
+    - php: 7.2
+      env: MOODLE_BRANCH=MOODLE_39_STABLE DB=pgsql
+    - php: 7.2
+      env: MOODLE_BRANCH=MOODLE_39_STABLE DB=mysqli
+    - php: 7.2
+      env: MOODLE_BRANCH=MOODLE_38_STABLE DB=pgsql
+    - php: 7.2
+      env: MOODLE_BRANCH=MOODLE_38_STABLE DB=mysqli
+    - php: 7.2
+      env: MOODLE_BRANCH=MOODLE_37_STABLE DB=pgsql
+    - php: 7.2
+      env: MOODLE_BRANCH=MOODLE_37_STABLE DB=mysqli
+    - php: 7.2
+      env: MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql NODE=8
+    - php: 7.2
+      env: MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli NODE=8
+
+    - php: 7.1
+      env: MOODLE_BRANCH=MOODLE_37_STABLE DB=pgsql
+    - php: 7.1
+      env: MOODLE_BRANCH=MOODLE_37_STABLE DB=mysqli
+    - php: 7.1
+      env: MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql NODE=8
+    - php: 7.1
+      env: MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli NODE=8
+
+    - php: 7.0
+      env: MOODLE_BRANCH=MOODLE_36_STABLE DB=pgsql NODE=8
+    - php: 7.0
+      env: MOODLE_BRANCH=MOODLE_36_STABLE DB=mysqli NODE=8
+
+    - php: 7.0
+      env: MOODLE_BRANCH=MOODLE_35_STABLE DB=pgsql
+    - php: 7.0
+      env: MOODLE_BRANCH=MOODLE_35_STABLE DB=mysqli
+
+    - php: 7.0
+      env: MOODLE_BRANCH=MOODLE_34_STABLE DB=pgsql NODE=8
+    - php: 7.0
+      env: MOODLE_BRANCH=MOODLE_34_STABLE DB=mysqli NODE=8
 
 script:
   - moodle-plugin-ci phplint
@@ -80,4 +122,6 @@ script:
   - moodle-plugin-ci mustache
   - moodle-plugin-ci grunt
   - moodle-plugin-ci phpunit
-  - moodle-plugin-ci behat --dump
+  - if [ $BEHAT == 'yes' ]; then
+        moodle-plugin-ci behat || travis_terminate 1;
+    fi
diff --git a/CHANGES.md b/CHANGES.md
index cd6eccc..8ce4cfc 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,10 @@ Changes
 -------
 
 
+### Release v3.9-r1
+
+* 2020-06-30 - Adopted .travis.yml to check 3.9 and master.
+
 ### Release v3.8-r4
 
 * 2020-02-28 - Adopted .travis.yml to new requirements regarding syntax.
diff --git a/version.php b/version.php
index 3e70885..0f8cf99 100644
--- a/version.php
+++ b/version.php
@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2020022800;
+$plugin->version  = 2020063000;
 $plugin->requires = 2017110800;
 $plugin->component = 'quiz_archive';
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = 'v3.8-r4';
+$plugin->release = 'v3.9-r1';