diff --git a/.travis.yml b/.travis.yml
index bcb26308a7..43d099699c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ cache:
 # the cache can grow constantly
 before_cache: rm -rf ${HOME}/.m2/repository/org/alfresco/alfresco-governance-services*
 
-before_install: 
+before_install:
   - cp .travis.settings.xml ${HOME}/.m2/settings.xml
   - docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD}
   - docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_PASSWORD}
@@ -65,14 +65,13 @@ jobs:
 
     - name: "Enterprise WORM Tests"
       stage: Tests
-      before_script:
+      install:
         - source scripts/setUpMavenPhase.sh
         - bash scripts/create-worm-bucket.sh
-      install: 
-        - travis_retry travis_wait 30 mvn -B deploy -N
-        - travis_retry travis_wait 60 mvn -B -q clean install $MVN_SKIP -f rm-community/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      before_script:
+        - travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am
       script:
-        - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=true -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+        - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
         - bash scripts/worm-mb-tests.sh
       # after_script: bash _ci/cleanup.sh
 
diff --git a/scripts/setUpMavenPhase.sh b/scripts/setUpMavenPhase.sh
index 688f019df8..384131f1ee 100644
--- a/scripts/setUpMavenPhase.sh
+++ b/scripts/setUpMavenPhase.sh
@@ -2,27 +2,22 @@
 echo "Branch name: ${TRAVIS_BRANCH}"
 echo "Pull request: ${TRAVIS_PULL_REQUEST}"
 echo "Travis job name: ${TRAVIS_JOB_NAME}"
-branchName=${TRAVIS_BRANCH}
-imageTag=${branchName:8}
-echo "Image tag: ${imageTag}"
+echo "Image tag: ${TRAVIS_BRANCH:8}"
 
-  if [[ ${TRAVIS_JOB_NAME} == "Build AGS Enterprise" ]];
-  then
-     export BUILD_PROFILE="internal"
-  else
-     export BUILD_PROFILE="master"
-  fi
+if [[ ${TRAVIS_JOB_NAME} == "Build AGS Enterprise" ]] ; then
+   export BUILD_PROFILE="internal"
+else
+   export BUILD_PROFILE="master"
+fi
 
-  if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]];
-  then
-      export MAVEN_PHASE="deploy"
-      export IMAGE_TAG="latest"
-  elif [[ ${TRAVIS_BRANCH} = release*  && "${TRAVIS_PULL_REQUEST}" == "false" ]];
-  then
-      export MAVEN_PHASE="deploy"
-      export IMAGE_TAG="${imageTag}-latest"
-  else
-      export MAVEN_PHASE="verify"
-      export BUILD_PROFILE="buildDockerImage"
-      export IMAGE_TAG="latest"
-  fi
+if [[ "${TRAVIS_BRANCH}" == "master" && "${TRAVIS_PULL_REQUEST}" == "false" ]] ; then
+   export MAVEN_PHASE="deploy"
+   export IMAGE_TAG="latest"
+elif [[ ${TRAVIS_BRANCH} = release*  && "${TRAVIS_PULL_REQUEST}" == "false" ]] ; then
+   export MAVEN_PHASE="deploy"
+   export IMAGE_TAG="${TRAVIS_BRANCH:8}-latest"
+else
+   export MAVEN_PHASE="verify"
+   export BUILD_PROFILE="buildDockerImage"
+   export IMAGE_TAG="latest"
+fi
diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh
index 22ca1bba59..bab453e535 100755
--- a/scripts/worm-mb-tests.sh
+++ b/scripts/worm-mb-tests.sh
@@ -16,7 +16,7 @@ export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2"
 export S3_PROTOCOL=s3v2
 export S3_BUCKET2_PROTOCOL=s3vTest
 
-bash ./scripts/start-compose.sh rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml
+bash scripts/start-compose.sh "${PWD}/rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml"
 
 # Run the WORM tests
 mvn -B -U clean test \