diff --git a/Tools/sitl_gazebo b/Tools/sitl_gazebo
index d03d8356c5..00dcabb1c2 160000
--- a/Tools/sitl_gazebo
+++ b/Tools/sitl_gazebo
@@ -1 +1 @@
-Subproject commit d03d8356c54c6321278273a7afaba76ace454372
+Subproject commit 00dcabb1c2c001b40713903da1a4a7f71d01ef27
diff --git a/integrationtests/run_tests.bash b/integrationtests/run_tests.bash
index da22cb5eef..2a3a4c2a0d 100755
--- a/integrationtests/run_tests.bash
+++ b/integrationtests/run_tests.bash
@@ -28,8 +28,12 @@ TEST_RESULT_TARGET_DIR=$JOB_DIR/test_results
 if [ -f /opt/ros/indigo/setup.bash ]
 then
 	source /opt/ros/indigo/setup.bash
-else
+elif [ -f /opt/ros/kinetic/setup.bash ]
+then
 	source /opt/ros/kinetic/setup.bash
+else
+	echo "could not find /opt/ros/{ros-distro}/setup.bash"
+	exit 1
 fi
 source $SRC_DIR/integrationtests/setup_gazebo_ros.bash $SRC_DIR