diff --git a/.travis.yml b/.travis.yml
index 7550e1d..e6bc258 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,8 @@ addons:
       - xsltproc
 env:
   - BUILD_DIR=$HOME/rabbitmq-public-umbrella CONSUL_VERSION=0.5.2 RABBIT_TAG=v3_5_4
-before_install:
-  - $TRAVIS_BUILD_DIR/travis-umbrella-setup.sh
 install:
+  - $TRAVIS_BUILD_DIR/travis-umbrella-setup.sh
   - $TRAVIS_BUILD_DIR/travis-install-consul.sh
 script: cd $BUILD_DIR/rabbitmq-autocluster-consul && make test
 after_script:
diff --git a/travis-install-consul.sh b/travis-install-consul.sh
index 4458116..3d232ac 100755
--- a/travis-install-consul.sh
+++ b/travis-install-consul.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-CONSUL_VERSION=${CONSUL_VERSION:-0.5.0}
+CONSUL_VERSION=${CONSUL_VERSION:-0.5.2}
 if [ ! -d "${HOME}/consul" ]; then
   echo "Downloading Consul ${CONSUL_VERSION}";
   curl -s -L -o /tmp/${CONSUL_VERSION}_linux_amd64.zip https://dl.bintray.com/mitchellh/consul/${CONSUL_VERSION}_linux_amd64.zip
diff --git a/travis-umbrella-setup.sh b/travis-umbrella-setup.sh
index 4d50c27..7c8a861 100755
--- a/travis-umbrella-setup.sh
+++ b/travis-umbrella-setup.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 BUILD_DIR=${BUILD_DIR:-${HOME}/rabbitmq-public-umbrella}
-RABBIT_TAG=${RABBIT_TAG:-v3_5_1}
+RABBIT_TAG=${RABBIT_TAG:-v3_5_4}
 echo "Build dir: ${BUILD_DIR}"
 echo "Travis build dir: ${TRAVIS_BUILD_DIR}"
-if [ ! -d $BUILD_DIR ]; then
-    git clone https://github.com/rabbitmq/rabbitmq-public-umbrella.git $BUILD_DIR
-    cd $BUILD_DIR
-    make co
+if [ -d ${BUILD_DIR} ]; then
+    rm -rf ${BUILD_DIR}
 fi
-cd $BUILD_DIR
-make BRANCH=rabbitmq_${RABBIT_TAG} up_c
-rm -rf ${BUILD_DIR}/rabbitmq-autocluster-consul
+git clone https://github.com/rabbitmq/rabbitmq-public-umbrella.git ${BUILD_DIR}
+cd ${BUILD_DIR}
+git checkout -b rabbitmq_${RABBIT_TAG}
+git pull origin rabbitmq_${RABBIT_TAG}
+make co
 cp -r ${TRAVIS_BUILD_DIR} ${BUILD_DIR}/