diff --git a/.editorConfig b/.editorConfig
index 1808f3da08..b411073df8 100644
--- a/.editorConfig
+++ b/.editorConfig
@@ -7,7 +7,7 @@ root = true
 # All files should use spaces.
 [*]
 indent_style = space
-end_of_line = crlf
+end_of_line = lf
 trim_trailing_whitespace = true
 indent_size = 3
 
diff --git a/.travis.yml b/.travis.yml
index 95378d49dc..6a5300bf79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,29 +48,28 @@ jobs:
 
     # - name: "Build AGS Enterprise"
     #   stage: Build AGS
-    #   before_script: source scripts/setUpMavenPhase.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: source scripts/setUpMavenPhase.sh
     #   script:
     #     - 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
 
     # - name: "Build AGS Benchmark"
     #   stage: Build AGS
-    #   before_script: source scripts/setUpMavenPhase.sh
     #   install:
     #     - travis_retry travis_wait 80 mvn -B -q clean install $MVN_SKIP -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+    #   before_script: source scripts/setUpMavenPhase.sh
     #   script:
     #     - travis_retry travis_wait 35 mvn -B -q ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
     - name: "Enterprise WORM Tests"
       stage: Tests
       install:
-        - source scripts/setUpMavenPhase.sh
-        - bash scripts/create-worm-bucket.sh
-      script:
-        - travis_retry travis_wait 80 mvn -B -q ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} $MVN_SKIP -f rm-enterprise/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-        - travis_wait 80 bash scripts/worm-mb-tests.sh
+        - travis_retry travis_wait 90 mvn -B -U -q install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo,:alfresco-governance-services-enterprise-share -am
+        - travis_retry travis_wait 30 mvn -B -U -q install $MVN_SKIP -pl alfresco-governance-services-automation -am
+      before_script: bash scripts/create-worm-bucket.sh
+      script: travis_wait 80 bash scripts/worm-mb-tests.sh
       after_script: bash scripts/cleanup.sh
 
     # - name: "Community Integrations Tests on MySQL"
diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh
index af51b40af0..28065ba62e 100755
--- a/scripts/worm-mb-tests.sh
+++ b/scripts/worm-mb-tests.sh
@@ -18,6 +18,8 @@ export S3_BUCKET2_PROTOCOL=s3vTest
 
 bash scripts/start-compose.sh "${PWD}/rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml"
 
+cd rm-automation/rm-automation-enterprise-rest-api
+
 # Run the WORM tests
 mvn -B -U clean test \
   -DsuiteXmlFile=wormTestSuite.xml \