diff --git a/.travis.yml b/.travis.yml
index f4c8121698..b88312efff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -96,8 +96,22 @@ jobs:
       before_script:
         - bash scripts/startAlfresco.sh $ENTERPRISE_REPO_PATH
         - bash scripts/waitForAlfrescoToStart.sh
+        - docker stats --no-stream
+        - docker update --memory=2Gb --memory-swap -1 rm-enterprise-repo_alfresco_1
+        - docker update --memory=1.5Gb --memory-swap -1 rm-enterprise-repo_search_1
+        - docker update --memory=1Gb --memory-swap -1 rm-enterprise-repo_zeppelin_1
+        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_postgres_1
+        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_transform-router_1
+        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_imagemagick_1
+        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_alfresco-pdf-renderer_1
+        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_shared-file-store_1
+        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_tika_1
+        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_libreoffice_1
+        - docker update --memory=512Mb --memory-swap -1 rm-enterprise-repo_activemq_1
+        - docker stats --no-stream
+        - sudo free -m -t
       script:
-        - mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false
+        - travis_wait 30 mvn -B test -pl :alfresco-governance-services-automation-enterprise-rest-api -Dskip.automationtests=false
       after_failure: docker ps -a | grep '_alfresco_1' | awk '{print $1}' | xargs docker logs | tail -5000
     - name: "Community UI Tests ..."
       stage: Tests
diff --git a/travis-env-vars.yml b/travis-env-vars.yml
index 52ad7fa47a..aa0e1f1190 100644
--- a/travis-env-vars.yml
+++ b/travis-env-vars.yml
@@ -8,4 +8,3 @@ env:
     - ENTERPRISE_REPO_PATH=rm-enterprise/rm-enterprise-repo
     - ENTERPRISE_SHARE_PATH=rm-enterprise/rm-enterprise-share
     - MVN_SKIP='-Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests'
-    - TRAVIS_WORKER_DOCKER_MEMORY=6.7G