diff --git a/.travis.sh b/.travis.sh
index 31b1f15..ace70f8 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -13,6 +13,8 @@ function error {
 trap error ERR
 
 apt-get update
+# https://stackoverflow.com/questions/44331836/apt-get-install-tzdata-noninteractive
+DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
 apt-get install -y sudo software-properties-common git wget sed gcc g++
 
 echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
diff --git a/.travis.yml b/.travis.yml
index 1246970..14080c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,14 +7,16 @@ notifications:
     on_failure: always
 env:
   matrix:
-    - ROS_DISTRO=indigo BUILDER='catkin_make'
-    - ROS_DISTRO=indigo BUILDER='catkin_make_isolated'
-    - ROS_DISTRO=indigo BUILDER='catkin build'
-    - ROS_DISTRO=kinetic BUILDER='catkin_make'
-    - ROS_DISTRO=kinetic BUILDER='catkin_make_isolated'
-    - ROS_DISTRO=kinetic BUILDER='catkin build'
+    - DISTRO=trusty ROS_DISTRO=indigo BUILDER='catkin_make'
+    - DISTRO=trusty ROS_DISTRO=indigo BUILDER='catkin_make_isolated'
+    - DISTRO=trusty ROS_DISTRO=indigo BUILDER='catkin build'
+    - DISTRO=xenial ROS_DISTRO=kinetic BUILDER='catkin_make'
+    - DISTRO=xenial ROS_DISTRO=kinetic BUILDER='catkin_make_isolated'
+    - DISTRO=xenial ROS_DISTRO=kinetic BUILDER='catkin build'
+    - DISTRO=bionic ROS_DISTRO=melodic BUILDER='catkin_make'
+    - DISTRO=bionic ROS_DISTRO=melodic BUILDER='catkin_make_isolated'
+    - DISTRO=bionic ROS_DISTRO=melodic BUILDER='catkin build'
 before_script:
-  - case $ROS_DISTRO in "hydro") export DISTRO=precise;; "indigo") export DISTRO=trusty;; "kinetic") export DISTRO=xenial;; esac;
   - export DOCKER_IMAGE=ubuntu:$DISTRO
   - export CI_SOURCE_PATH=$(pwd)
   - export REPOSITORY_NAME=${PWD##*/}