diff --git a/.ci/travis/travis.sh b/.ci/travis/travis.sh
index fc5fd314a..93d6a2f28 100755
--- a/.ci/travis/travis.sh
+++ b/.ci/travis/travis.sh
@@ -2,7 +2,7 @@
 # Attention, there is no "-x" to avoid problems on Travis
 set -e
 
-case "$GOAL" in
+case $1 in
 
 nondex)
   # exclude ConfigurationLoaderTest till https://github.com/TestingResearchIllinois/NonDex/issues/112
diff --git a/.travis.yml b/.travis.yml
index 68e7b7572..35b674d5a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,8 +54,7 @@ matrix:
     - jdk: oraclejdk8
       env:
         - DESC="NonDex"
-        - GOAL="nondex"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh nondex"
         - 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)
@@ -73,87 +72,75 @@ matrix:
     - jdk: oraclejdk8
       env:
         - DESC="assembly & run '-all' jar"
-        - GOAL="assembly-run-all-jar"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh assembly-run-all-jar"
         - COVERAGE_CMD=""
     # https://sonarqube.com (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="sonarqube.com"
-        - GOAL="sonarqube"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh sonarqube"
         - COVERAGE_CMD=""
 
     # NoExceptiontest - Checkstyle, sevntu-checkstyle (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="NoExceptionTest - Checkstyle, sevntu-checkstyle"
-        - GOAL="no-exception-test-checkstyle-sevntu-checkstyle"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh no-exception-test-checkstyle-sevntu-checkstyle"
         - COVERAGE_CMD=""
     # NoExceptiontest - Guava (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="NoExceptionTest - Guava"
-        - GOAL="no-exception-test-guava"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh no-exception-test-guava"
         - COVERAGE_CMD=""
     # NoExceptiontest - Guava with google_checks (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="NoExceptionTest - Guava with google_checks"
-        - GOAL="no-exception-test-guava-with-google-checks"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh no-exception-test-guava-with-google-checks"
         - COVERAGE_CMD=""
     # NoExceptionTest - Hibernate ORM (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="NoExceptionTest - Hibernate ORM"
-        - GOAL="no-exception-test-hibernate"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh no-exception-test-hibernate"
         - COVERAGE_CMD=""
     # NoExceptionTest - FindBugs (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="NoExceptionTest - FindBugs"
-        - GOAL="no-exception-test-findbugs"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh no-exception-test-findbugs"
         - COVERAGE_CMD=""
     # NoExceptionTest - Pmd,elasticsearch,lombok-ast (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="NoExceptionTest - Pmd,elasticsearch,lombok-ast"
-        - GOAL="no-exception-test-Pmd-elasticsearch-lombok-ast"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh no-exception-test-Pmd-elasticsearch-lombok-ast"
         - COVERAGE_CMD=""
     # NoExceptionTest - RxJava,java-design-patterns,MaterialDesignLibrary,apache-ant,apache-jsecurity,android-launcher (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="NoExceptionTest - RxJava,java-design-patterns,MaterialDesignLibrary,apache-ant,apache-jsecurity,android-launcher"
-        - GOAL="no-exception-test-alot-of-project1"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh no-exception-test-alot-of-project1"
         - COVERAGE_CMD=""
     # NoExceptionTest - Spring (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="NoExceptionTest - Spring"
-        - GOAL="no-exception-test-spring-framework"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh no-exception-test-spring-framework"
         - COVERAGE_CMD=""
     # NoExceptionTest - Hbase (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="NoExceptionTest - Hbase"
-        - GOAL="no-exception-test-hbase"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh no-exception-test-hbase"
         - COVERAGE_CMD=""
 
     # release dry run (oraclejdk8)
     - jdk: oraclejdk8
       env:
         - DESC="release dry run"
-        - GOAL="release-dry-run"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh release-dry-run"
         - COVERAGE_CMD=""
 
     # unit tests in German locale (oraclejdk8)
@@ -216,30 +203,26 @@ matrix:
     - jdk: oraclejdk8
       env:
         - DESC="Releasenotes generation"
-        - GOAL="releasenotes-gen"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh releasenotes-gen"
         - COVERAGE_CMD=""
 
     # testing of PR format
     - env:
         - DESC="test Issue ref in PR description"
-        - GOAL="pr-description"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh pr-description"
         - COVERAGE_CMD=""
 
     # Check the chmod on files.
     - env:
         - DESC="check permissions on all files"
-        - GOAL="check-chmod"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh check-chmod"
         - COVERAGE_CMD=""
 
     # Ensure that all Sevntu check are kused
     - jdk: oraclejdk8
       env:
         - DESC="All sevntu checks should be used"
-        - GOAL="all-sevntu-checks"
-        - CMD="./.ci/travis/travis.sh"
+        - CMD="./.ci/travis/travis.sh all-sevntu-checks"
         - COVERAGE_CMD=""
 
 script: eval $CMD