diff --git a/.travis.rosinstall b/.travis.rosinstall
new file mode 100644
index 0000000..3afb542
--- /dev/null
+++ b/.travis.rosinstall
@@ -0,0 +1,4 @@
+- git:
+    local-name: universal_robot
+    uri: 'https://github.com/fmauch/universal_robot.git'
+    version: calibration_devel
diff --git a/.travis.rosinstall.kinetic b/.travis.rosinstall.kinetic
deleted file mode 100644
index 55bfe72..0000000
--- a/.travis.rosinstall.kinetic
+++ /dev/null
@@ -1,4 +0,0 @@
-- git:
-    local-name: universal_robot
-    uri: 'https://github.com/ros-industrial/universal_robot.git'
-    version: kinetic-devel
diff --git a/.travis.yml b/.travis.yml
index 3c4497b..b8a0001 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
-sudo: required
-dist: trusty
 language: generic
+services:
+  - docker
 
 cache:
   directories:
@@ -10,19 +10,9 @@ env:
   global:
     - CCACHE_DIR=$HOME/.ccache
   matrix:
-    - ROS_DISTRO="indigo"  ROS_REPO=ros              NOT_TEST_INSTALL=true
-    - ROS_DISTRO="indigo"  ROS_REPO=ros-shadow-fixed NOT_TEST_INSTALL=true
-    - ROS_DISTRO="kinetic" ROS_REPO=ros              NOT_TEST_INSTALL=true
-    - ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed NOT_TEST_INSTALL=true
-    - ROS_DISTRO="kinetic" ROS_REPO=ros              NOT_TEST_INSTALL=true UPSTREAM_WORKSPACE=file
-    - ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed NOT_TEST_INSTALL=true UPSTREAM_WORKSPACE=file
+    - ROS_DISTRO="kinetic" ROS_REPO=ros UPSTREAM_WORKSPACE=file
+    - ROS_DISTRO="melodic" ROS_REPO=ros UPSTREAM_WORKSPACE=file
     - ROS_DISTRO="kinetic" CLANG_FORMAT_CHECK=file
-matrix:
-  allow_failures:
-    - env: ROS_DISTRO="indigo"  ROS_REPO=ros              NOT_TEST_INSTALL=true
-    - env: ROS_DISTRO="indigo"  ROS_REPO=ros-shadow-fixed NOT_TEST_INSTALL=true
-    - env: ROS_DISTRO="kinetic" ROS_REPO=ros              NOT_TEST_INSTALL=true
-    - env: ROS_DISTRO="kinetic" ROS_REPO=ros-shadow-fixed NOT_TEST_INSTALL=true
 
 install:
   - git clone --depth=1 https://github.com/ros-industrial/industrial_ci.git .ci_config