diff --git a/scripts/create-worm-bucket.sh b/scripts/create-worm-bucket.sh
index c3b44792df..a3ff254ad6 100644
--- a/scripts/create-worm-bucket.sh
+++ b/scripts/create-worm-bucket.sh
@@ -8,6 +8,11 @@ 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
 
+if aws s3 ls | awk '{print $3}' | grep -q "^${S3_BUCKET2_NAME}$" ; then
+  echo "Bucket ${S3_BUCKET2_NAME} already exists"
+  exit 0
+fi
+
 aws s3api create-bucket --bucket "${S3_BUCKET2_NAME}" --region ${S3_BUCKET_REGION} --object-lock-enabled-for-bucket
 aws s3api put-object-lock-configuration \
     --bucket "${S3_BUCKET2_NAME}" \
diff --git a/travis-env-vars.yml b/travis-env-vars.yml
index 14b158b159..fe0aed8112 100644
--- a/travis-env-vars.yml
+++ b/travis-env-vars.yml
@@ -12,7 +12,7 @@ env:
     - AWS_SECRET_ACCESS_KEY=${CREATE_BUCKET_AWS_SECRET_KEY}
     - S3_BUCKET_REGION="us-east-1"
     - S3_BUCKET_NAME="travis-ags-${TRAVIS_JOB_NUMBER}"
-    - S3_BUCKET2_NAME="travis-ags-worm-${TRAVIS_JOB_NUMBER}-b2"
+    - S3_BUCKET2_NAME="travis-ags-worm-b2"
     - ALFRESCO_URL="http://localhost:8080/alfresco"
     - SHARE_URL="http://localhost:8181/share"
     - DISPLAY=:99.0