diff --git a/.travis.yml b/.travis.yml
index 239e77586..671652f60 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
+sudo: required
 language:
   - cpp
   - python
 python:
   - "2.7"
+services:
+  - docker
 compiler:
   - gcc
 notifications:
@@ -13,8 +16,10 @@ notifications:
 env:
   - ROS_DISTRO=hydro  ROSWS=wstool BUILDER=catkin    USE_DEB=true  ROS_PARALLEL_JOBS="-j2 -l2"
 #  - ROS_DISTRO=hydro  ROSWS=wstool BUILDER=catkin    USE_DEB=false ROS_PARALLEL_JOBS="-j2 -l2" NOT_TEST_INSTALL="true"
-  - ROS_DISTRO=indigo  ROSWS=wstool BUILDER=catkin   USE_DEB=true  ROS_PARALLEL_JOBS="-j8"
+  - ROS_DISTRO=indigo  ROSWS=wstool BUILDER=catkin  USE_TRAVIS=true USE_DEB=true  ROS_PARALLEL_JOBS="-j8"
 #  - ROS_DISTRO=indigo  ROSWS=wstool BUILDER=catkin   USE_DEB=false ROS_PARALLEL_JOBS="-j8" NOT_TEST_INSTALL="true"
-  - ROS_DISTRO=jade  ROSWS=wstool BUILDER=catkin   USE_DEB=true  ROS_PARALLEL_JOBS="-j8"
+  - ROS_DISTRO=jade  ROSWS=wstool BUILDER=catkin  USE_TRAVIS=true USE_DEB=true  ROS_PARALLEL_JOBS="-j8"
 #  - ROS_DISTRO=jade  ROSWS=wstool BUILDER=catkin   USE_DEB=false ROS_PARALLEL_JOBS="-j8" NOT_TEST_INSTALL="true"
-script: source .travis/travis.sh
+script:
+  - (cd .travis; patch -p0 travis.sh < ../patch)
+  - source .travis/travis.sh
diff --git a/patch b/patch
new file mode 100644
index 000000000..bdb351e7b
--- /dev/null
+++ b/patch
@@ -0,0 +1,13 @@
+diff --git a/travis.sh b/travis.sh
+index 7a3f7fe..841ea29 100755
+--- a/travis.sh
++++ b/travis.sh
+@@ -195,7 +195,7 @@ if [ "$NOT_TEST_INSTALL" != "true" ]; then
+     travis_time_end
+     travis_time_start catkin_install_run_tests
+ 
+-    if [ "$BUILDER" == catkin ]; then export EXIT_STATUS=0; for pkg in $TEST_PKGS; do echo "test $pkg..." ;[ "`find install/share/$pkg -iname '*.test'`" == "" ] && echo "[$pkg] No tests were found!!!"  || find install/share/$pkg -iname "*.test" -print0 | xargs -0 -n1 -I{} sh -c 'echo {}; rostest {}' || export EXIT_STATUS=$?; done; [ $EXIT_STATUS == 0 ] || error; fi
++    if [ "$BUILDER" == catkin ]; then export EXIT_STATUS=0; for pkg in $TEST_PKGS; do echo "test $pkg..." ;[ "`find install/share/$pkg -iname '*.test'`" == "" ] && echo "[$pkg] No tests were found!!!"  || find install/share/$pkg -iname "*.test" -print0 | xargs -0 -n1 rostest --text || export EXIT_STATUS=$?; done; [ $EXIT_STATUS == 0 ] || error; fi
+ 
+     travis_time_end
+