diff --git a/.travis.yml b/.travis.yml
index 29b706c61d..a1be747082 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,14 +46,14 @@ jobs:
     #   script:
     #     - travis_retry travis_wait 120 mvn -B -q clean ${MAVEN_PHASE} -P${BUILD_PROFILE} -Dimage.tag=${IMAGE_TAG} -Dskip.integrationtests=false -Dcommunity -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
-    # - 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
-    #   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 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
+      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
@@ -65,7 +65,7 @@ jobs:
 
     - name: "Enterprise WORM Tests"
       stage: Tests
-      install: travis_retry travis_wait 90 mvn -B -U install $MVN_SKIP -PbuildDockerImage -pl :alfresco-governance-services-enterprise-repo -am
+      before_script: bash scripts/create-worm-bucket.sh
       script: bash scripts/worm-mb-tests.sh
       # after_script: bash _ci/cleanup.sh
 
diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh
new file mode 100644
index 0000000000..e6ae397ce4
--- /dev/null
+++ b/scripts/create-worm-bucket.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+echo "=========================== Create Worm Bucket ==========================="
+PS4="\[\e[35m\]+ \[\e[m\]"
+set -vex
+pushd "$(dirname "${BASH_SOURCE[0]}")/../"
+
+pip install awscli
+printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure
+
+export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY}
+export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY}
+
+export S3_BUCKET_REGION="eu-west-1"
+export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2"
+export S3_PROTOCOL=s3v2
+export S3_BUCKET2_PROTOCOL=s3vTest
+
+aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 --object-lock-enabled-for-bucket
+aws s3api put-object-lock-configuration \
+    --bucket "${S3_BUCKET2_NAME}" \
+    --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}'
+
+popd
+set +vex
+echo "=========================== Finishing Create Worm Bucket Script =========================="
\ No newline at end of file
diff --git a/scripts/worm-mb-tests.sh b/scripts/worm-mb-tests.sh
index 28fc2cdc2a..22ca1bba59 100755
--- a/scripts/worm-mb-tests.sh
+++ b/scripts/worm-mb-tests.sh
@@ -7,9 +7,6 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../"
 
 docker login quay.io -u ${QUAY_USERNAME} -p ${QUAY_PASSWORD}
 
-pip install awscli
-printf "${CREATE_BUCKET_AWS_ACCESS_KEY}\n${CREATE_BUCKET_AWS_SECRET_KEY}\n\n\n" | aws configure
-
 export AWS_ACCESS_KEY_ID=${CREATE_BUCKET_AWS_ACCESS_KEY}
 export AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY}
 
@@ -19,11 +16,6 @@ export S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2"
 export S3_PROTOCOL=s3v2
 export S3_BUCKET2_PROTOCOL=s3vTest
 
-aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region us-east-1 --object-lock-enabled-for-bucket
-aws s3api put-object-lock-configuration \
-    --bucket "${S3_BUCKET2_NAME}" \
-    --object-lock-configuration '{ "ObjectLockEnabled": "Enabled", "Rule": { "DefaultRetention": { "Mode": "COMPLIANCE", "Days": 1 }}}'
-
 bash ./scripts/start-compose.sh rm-enterprise/rm-enterprise-share/worm-support-docker-compose.yml
 
 # Run the WORM tests