diff --git a/.travis.yml b/.travis.yml
index 3e0639b129..902390d1be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,63 +29,45 @@ services:
   - docker
 
 stages:
-#  - name: Build AGS
+  - name: Build AGS
   - name: Tests
     if: commit_message !~ /\[skip tests\]/
   - name: Security Scans
   - name: Release
   - name: Publish
 
-_shared_job: &enterprise_shared_UI_configuration
-  stage: Tests
-  addons:
-    firefox: "43.0.1"
-    artifacts:
-      paths:
-        - ./rm-automation/rm-automation-ui/target/surefire-reports
-        - ./rm-automation/rm-automation-ui/target/reports
-        - ./rm-automation/rm-automation-ui/target/screenshots
-      target_paths: $TRAVIS_BUILD_NUMBER
-  before_install:
-    - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc
-    - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q
-    - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target
-  install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml
-  script:
-    - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=$TEST_SUITE -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS}
-
 jobs:
   include:
-#    - name: "Build AGS Community"
-#      stage: Build AGS
-#      before_script: source scripts/setUpMavenPhase.sh
-#      script:
-#        - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -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 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 clean ${MAVEN_PHASE} -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 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-#      script:
-#        - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-#
-#    - name: "Community Integrations Tests on MySQL"
-#      stage: Tests
-#      script:
-#        - echo "Community Integrations Tests on MySQL"
-#    - name: "Enterprise Integrations Tests on MySQL"
-#      stage: Tests
-#      script:
-#        - echo "Enterprise Integrations Tests on MySQL"
+    - name: "Build AGS Community"
+      stage: Build AGS
+      before_script: source scripts/setUpMavenPhase.sh
+      script:
+        - travis_retry travis_wait 80 mvn -B -q clean ${MAVEN_PHASE} -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 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -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 clean ${MAVEN_PHASE} -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 60 mvn -B -q clean install -DskipTests -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      script:
+        - travis_retry travis_wait 35 mvn -B -q clean ${MAVEN_PHASE} -Dskip.integrationtests=false -f rm-benchmark/pom.xml -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+
+    - name: "Community Integrations Tests on MySQL"
+      stage: Tests
+      script:
+        - echo "Community Integrations Tests on MySQL"
+    - name: "Enterprise Integrations Tests on MySQL"
+      stage: Tests
+      script:
+        - echo "Enterprise Integrations Tests on MySQL"
 
     - name: "Community Rest API Tests"
       stage: Tests
@@ -134,9 +116,24 @@ jobs:
       script:
         - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B install -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=communityLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS}
 
-    - <<: *enterprise_shared_UI_configuration
+    - &enterprise_shared_UI_configuration
       name: "Enterprise Level 2 UI Tests"
-      env: TEST_SUITE=enterpriseLevel2Tests.xml
+      stage: Tests
+      addons:
+        firefox: "43.0.1"
+        artifacts:
+          paths:
+            - ./rm-automation/rm-automation-ui/target/surefire-reports
+            - ./rm-automation/rm-automation-ui/target/reports
+            - ./rm-automation/rm-automation-ui/target/screenshots
+          target_paths: $TRAVIS_BUILD_NUMBER
+      before_install:
+        - echo "MAVEN_OPTS='-Xms1024m -Xmx1G -noverify'" > ~/.mavenrc
+        - travis_retry travis_wait 90 mvn -B install -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -DskipTests -q
+        - travis_wait 5 bash scripts/downloadInstaller.sh $AUTOMATION_UI_PATH/target
+      install: travis_wait 20 mvn -B install -PinstallAlfresco,apply-rm-enterprise -q -f $AUTOMATION_UI_PATH/pom.xml
+      script:
+        - travis_wait 60 xvfb-run --server-args="-screen 0 1920x1080x24" mvn -B test -Prun-alfresco -Dskip.automationtests=false -f $AUTOMATION_UI_PATH/pom.xml -DsuiteXmlFile=enterpriseLevel2Tests.xml -Dshare.url=${SHARE_URL} -Dalfresco.url=${ALFRESCO_URL} ${WEBDRIVER_ARGUMENTS}
 
     - <<: *enterprise_shared_UI_configuration
       name: "Enterprise Classification Level 2 UI Tests"