diff --git a/.travis.yml b/.travis.yml
index 56ba1be..c4ee9f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Copyright 2016, 2017, 2018 Peter Dimov
+# Copyright 2016-2019 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
 # (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt)
 
@@ -26,7 +26,7 @@ matrix:
   include:
     - os: linux
       compiler: g++
-      env: TOOLSET=gcc CXXSTD=03,11 VARIANT=debug,release
+      env: TOOLSET=gcc CXXSTD=03,11
 
     - os: linux
       compiler: g++-4.4
@@ -99,7 +99,7 @@ matrix:
 
     - os: linux
       compiler: g++-7
-      env: TOOLSET=gcc CXXSTD=03,11,14,17 VARIANT=release
+      env: TOOLSET=gcc CXXSTD=03,11,14,17
       addons:
         apt:
           packages:
@@ -117,6 +117,16 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
 
+    - os: linux
+      compiler: g++-9
+      env: TOOLSET=gcc CXXSTD=03,11,14,17,2a
+      addons:
+        apt:
+          packages:
+            - g++-9
+          sources:
+            - ubuntu-toolchain-r-test
+
     - os: linux
       compiler: g++-7
       env: UBSAN=1 TOOLSET=gcc CXXSTD=03,11,14,17 UBSAN_OPTIONS=print_stacktrace=1 LINKFLAGS=-fuse-ld=gold
@@ -129,7 +139,7 @@ matrix:
 
     - os: linux
       compiler: clang++
-      env: TOOLSET=clang CXXSTD=03,11 VARIANT=debug,release
+      env: TOOLSET=clang CXXSTD=03,11
 
     - os: linux
       compiler: /usr/bin/clang++
@@ -218,7 +228,7 @@ matrix:
 
     - os: linux
       compiler: clang++-5.0
-      env: TOOLSET=clang CXXSTD=03,11,14,1z VARIANT=release
+      env: TOOLSET=clang CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -250,19 +260,30 @@ matrix:
             - llvm-toolchain-trusty-7
 
     - os: linux
-      compiler: clang++-5.0
-      env: UBSAN=1 TOOLSET=clang CXXSTD=03,11,14,1z UBSAN_OPTIONS=print_stacktrace=1
+      compiler: clang++-8
+      env: TOOLSET=clang CXXSTD=03,11,14,17,2a
       addons:
         apt:
           packages:
-            - clang-5.0
+            - clang-8
           sources:
             - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-5.0
+            - llvm-toolchain-trusty-8
+
+    - os: linux
+      compiler: clang++-8
+      env: UBSAN=1 TOOLSET=clang CXXSTD=03,11,14,17,2a UBSAN_OPTIONS=print_stacktrace=1
+      addons:
+        apt:
+          packages:
+            - clang-8
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-trusty-8
 
     - os: linux
       compiler: clang++-libc++
-      env: TOOLSET=clang CXXSTD=03,11,14,1z VARIANT=release
+      env: TOOLSET=clang CXXSTD=03,11,14,1z
       addons:
         apt:
           packages:
@@ -294,7 +315,7 @@ install:
 script:
   - |-
     echo "using $TOOLSET : : $TRAVIS_COMPILER ;" > ~/user-config.jam
-  - ./b2 -j3 libs/function/test toolset=$TOOLSET cxxstd=$CXXSTD ${VARIANT:+variant=$VARIANT} ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
+  - ./b2 -j3 libs/function/test toolset=$TOOLSET cxxstd=$CXXSTD variant=debug,release ${UBSAN:+cxxflags=-fsanitize=undefined cxxflags=-fno-sanitize-recover=undefined linkflags=-fsanitize=undefined debug-symbols=on} ${LINKFLAGS:+linkflags=$LINKFLAGS}
 
 notifications:
   email: