diff --git a/.ci/travis/travis.sh b/.ci/travis/travis.sh
index 856ad2d01..5b8239e24 100755
--- a/.ci/travis/travis.sh
+++ b/.ci/travis/travis.sh
@@ -4,6 +4,40 @@ set -e
 
 case "$GOAL" in
 
+nondex)
+  mvn --fail-never clean nondex:nondex
+  cat `grep -RlE 'td class=.x' .nondex/ | cat` < /dev/null > output.txt
+  RESULT=$(cat output.txt | wc -c)
+  cat output.txt
+  echo 'Size of output:'$RESULT
+  if [[ $RESULT != 0 ]]; then false; fi
+  ;;
+
+assembly-run-all-jar)
+  mvn clean package -Passembly
+  CS_POM_VERSION=$(mvn -q -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
+  echo version:$CS_POM_VERSION
+  java -jar target/checkstyle-$CS_POM_VERSION-all.jar -c /google_checks.xml \
+        src/it/resources/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/InputNoLineWrapGood.java > output.log
+  if grep -vE '(Starting audit)|(warning)|(Audit done.)' output.log ; then exit 1; fi
+  if grep 'warning' output.log ; then exit 1; fi
+  ;;
+
+sonarqube)
+  if [[ $TRAVIS_PULL_REQUEST =~ ^([0-9]*)$ ]]; then exit 0; fi
+  mvn clean package cobertura:cobertura sonar:sonar \
+       -Dsonar.host.url=https://sonarqube.com \
+       -Dsonar.login=$SONAR_TOKEN \
+       -Dcobertura.report.format=xml -Dmaven.test.failure.ignore=true \
+       -Dcheckstyle.skip=true -Dpmd.skip=true -Dcheckstyle.ant.skip=true
+  ;;
+
+release-dry-run)
+  mvn release:prepare -DdryRun=true --batch-mode -Darguments='-DskipTests -DskipITs \
+    -Dcobertura.skip=true -Dpmd.skip=true -Dfindbugs.skip=true  -Dxml.skip=true \
+    -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true -Dgpg.skip=true'
+  ;;
+
 releasenotes-gen)
   .ci/travis/xtr_releasenotes-gen.sh
   ;;
diff --git a/.travis.yml b/.travis.yml
index bdb0174b8..e35863580 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,11 @@ matrix:
   include:
     # unit tests (oraclejdk8)
     - jdk: oraclejdk8
-      env: DESC="tests and deploy" CMD="mvn clean integration-test failsafe:verify" COVERAGE_CMD="" DEPLOY="true"
+      env:
+        - DESC="tests and deploy"
+        - CMD="mvn clean integration-test failsafe:verify"
+        - COVERAGE_CMD=""
+        - DEPLOY="true"
 
     # checkstyle (oraclejdk8)
     - jdk: oraclejdk8
@@ -50,11 +54,8 @@ matrix:
     - jdk: oraclejdk8
       env:
         - DESC="NonDex"
-        - CMD1="mvn --fail-never clean nondex:nondex "
-        - CMD2=" && cat `grep -RlE 'td class=.x' .nondex/ | cat` < /dev/null > output.txt "
-        - CMD3=" && RESULT=\$(cat output.txt | wc -c) && cat output.txt "
-        - CMD4=" && echo 'Size of output:'\$RESULT && if [[ \$RESULT != 0 ]]; then false; fi"
-        - CMD=$CMD1$CMD2$CMD3$CMD4
+        - GOAL="nondex"
+        - CMD="./.ci/travis/travis.sh"
         - COVERAGE_CMD=""
 
     # site (oraclejdk8 as 'site' success is required to be sure that on release time all will be ok, admins will use oracle8 version)
@@ -72,26 +73,15 @@ matrix:
     - jdk: oraclejdk8
       env:
         - DESC="assembly & run '-all' jar"
-        - CMD1="mvn clean package -Passembly"
-        - CMD2=" && CS_POM_VERSION=$(mvn -q -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)"
-        - CMD3=" && echo version:\$CS_POM_VERSION"
-        - CMD4=" && java -jar target/checkstyle-\$CS_POM_VERSION-all.jar -c /google_checks.xml"
-        - CMD5="      src/it/resources/com/google/checkstyle/test/chapter3filestructure/rule332nolinewrap/InputNoLineWrapGood.java > output.log"
-        - CMD6=" && if grep -vE '(Starting audit)|(warning)|(Audit done.)' output.log ; then exit 1; fi "
-        - CMD7=" && if grep 'warning' output.log ; then exit 1; fi"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7
+        - GOAL="assembly-run-all-jar"
+        - CMD="./.ci/travis/travis.sh"
         - COVERAGE_CMD=""
     # https://sonarqube.com (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="sonarqube.com"
-        - CMD1="if [[ $TRAVIS_PULL_REQUEST =~ ^([0-9]*)$ ]]; then exit 0; fi "
-        - CMD2=" && mvn clean package cobertura:cobertura sonar:sonar "
-        - CMD3="     -Dsonar.host.url=https://sonarqube.com "
-        - CMD4="     -Dsonar.login=\$SONAR_TOKEN "
-        - CMD5="     -Dcobertura.report.format=xml -Dmaven.test.failure.ignore=true "
-        - CMD6="     -Dcheckstyle.skip=true -Dpmd.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6
+        - GOAL="sonarqube"
+        - CMD="./.ci/travis/travis.sh"
         - COVERAGE_CMD=""
 
     # NoExceptiontest - Checkstyle, sevntu-checkstyle (oraclejdk8)
@@ -222,10 +212,8 @@ matrix:
     - jdk: oraclejdk8
       env:
         - DESC="release dry run"
-        - CMD1="mvn release:prepare -DdryRun=true --batch-mode -Darguments='-DskipTests -DskipITs "
-        - CMD2="    -Dcobertura.skip=true -Dpmd.skip=true -Dfindbugs.skip=true  -Dxml.skip=true"
-        - CMD3="    -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true -Dgpg.skip=true'"
-        - CMD=$CMD1$CMD2$CMD3
+        - GOAL="release-dry-run"
+        - CMD="./.ci/travis/travis.sh"
         - COVERAGE_CMD=""
 
     # unit tests in German locale (oraclejdk8)