diff --git a/.travis.yml b/.travis.yml
index 2726d366e..853bb9b23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ matrix:
     # checkstyle (oraclejdk8)
     - jdk: oraclejdk8
       env:
-        - DESC="checkstyle"
+        - DESC="checkstyle and sevntu-checkstyle"
         - CMD="mvn clean verify -DskipTests -DskipITs -Dpmd.skip=true -Dfindbugs.skip=true -Dcobertura.skip=true"
         - COVERAGE_CMD=""
 
@@ -36,8 +36,9 @@ matrix:
       env:
         - DESC="site"
         - CMD1="mvn clean site -Dlinkcheck.skip=true -DskipTests -DskipITs "
-        - CMD2=" -Dpmd.skip=true -Dfindbugs.skip=true -Dcobertura.skip=true -Dcheckstyle.ant.skip=true"
-        - CMD=$CMD1$CMD2
+        - CMD2=" -Dpmd.skip=true -Dfindbugs.skip=true -Dcobertura.skip=true "
+        - CMD3=" -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true"
+        - CMD=$CMD1$CMD2$CMD3
         - COVERAGE_CMD=""
     # assembly (oraclejdk8)
     - jdk: oraclejdk8
@@ -67,13 +68,14 @@ matrix:
       env:
         - DESC="NoErrorTest - Orekit"
         - CMD1="mvn clean install -DskipTests -DskipITs -Dcobertura.skip=true "
-        - CMD2="              -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD3=" && git clone https://github.com/checkstyle/Orekit.git && cd Orekit"
-        - CMD4=" && sed -i 's/<orekit\.checkstyle\.version>6\.6</<orekit.checkstyle.version>"
-        - CMD5="$(mvn -q -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)</"
-        - CMD6="' pom.xml "
-        - CMD7=" && mvn compile checkstyle:check"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7
+        - CMD2="              -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD3="              -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true"
+        - CMD4=" && git clone https://github.com/checkstyle/Orekit.git && cd Orekit"
+        - CMD5=" && sed -i 's/<orekit\.checkstyle\.version>6\.6</<orekit.checkstyle.version>"
+        - CMD6="$(mvn -q -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)</"
+        - CMD7="' pom.xml "
+        - CMD8=" && mvn compile checkstyle:check"
+        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8
         - COVERAGE_CMD=""
 
     # NoExceptiontest - Checkstyle, sevntu-checkstyle (oraclejdk8)
@@ -86,10 +88,11 @@ matrix:
         - CMD4=" && sed -i 's/#sevntu-checkstyle/sevntu-checkstyle/' projects-for-travis.properties "
         - CMD5=" && sed -i 's/projects-to-test-on.properties/projects-for-travis.properties/' launch.sh "
         - CMD6=" && cd ../../ && mvn clean install -DskipTests -DskipITs -Dcobertura.skip=true "
-        - CMD7="                  -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD8=" && cd contribution/checkstyle-tester "
-        - CMD9=" && ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9
+        - CMD7="                  -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD8="                  -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true "
+        - CMD9=" && cd contribution/checkstyle-tester "
+        - CMD10=" && ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
+        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9$CMD10
         - COVERAGE_CMD=""
     # NoExceptiontest - Guava (oraclejdk8)
     - jdk: oraclejdk8
@@ -100,10 +103,11 @@ matrix:
         - CMD3=" && sed -i 's/#guava/guava/' projects-for-travis.properties"
         - CMD4=" && sed -i 's/projects-to-test-on.properties/projects-for-travis.properties/' launch.sh"
         - CMD5=" && cd ../../ && mvn clean install -DskipTests -DskipITs -Dcobertura.skip=true"
-        - CMD6="                   -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD7=" && cd contribution/checkstyle-tester "
-        - CMD8=" && ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8
+        - CMD6="                   -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD7="                   -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true "
+        - CMD8=" && cd contribution/checkstyle-tester "
+        - CMD9=" && ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
+        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9
         - COVERAGE_CMD=""
     # NoExceptionTest - Hibernate ORM (oraclejdk8)
     - jdk: oraclejdk8
@@ -114,10 +118,11 @@ matrix:
         - CMD3="&& sed -i 's/#hibernate-orm/hibernate-orm/' projects-for-travis.properties "
         - CMD4="&& sed -i 's/projects-to-test-on.properties/projects-for-travis.properties/' launch.sh "
         - CMD5="&& cd ../../ && mvn clean install -DskipTests -DskipITs -Dcobertura.skip=true "
-        - CMD6="                  -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD7="&& cd contribution/checkstyle-tester "
-        - CMD8="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8
+        - CMD6="                  -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD7="                  -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true "
+        - CMD8="&& cd contribution/checkstyle-tester "
+        - CMD9="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
+        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9
         - COVERAGE_CMD=""
     # NoExceptionTest - FindBugs (oraclejdk8)
     - jdk: oraclejdk8
@@ -128,10 +133,11 @@ matrix:
         - CMD3="&& sed -i 's/#findbugs/findbugs/' projects-for-travis.properties "
         - CMD4="&& sed -i 's/projects-to-test-on.properties/projects-for-travis.properties/' launch.sh "
         - CMD5="&& cd ../../ && mvn clean install -DskipTests -DskipITs -Dcobertura.skip=true "
-        - CMD6="                  -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD7="&& cd contribution/checkstyle-tester "
-        - CMD8="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8
+        - CMD6="                  -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD7="                  -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true "
+        - CMD8="&& cd contribution/checkstyle-tester "
+        - CMD9="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
+        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9
         - COVERAGE_CMD=""
     # NoExceptionTest - Pmd,elasticsearch,lombok-ast (oraclejdk8)
     - jdk: oraclejdk8
@@ -144,10 +150,11 @@ matrix:
         - CMD5="&& sed -i 's/#lombok-ast/lombok-ast/' projects-for-travis.properties "
         - CMD6="&& sed -i 's/projects-to-test-on.properties/projects-for-travis.properties/' launch.sh "
         - CMD7="&& cd ../../ && mvn clean install -DskipTests -DskipITs -Dcobertura.skip=true "
-        - CMD8="                  -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD9="&& cd contribution/checkstyle-tester "
-        - CMD10="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9$CMD10
+        - CMD8="                  -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD9="                  -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true "
+        - CMD10="&& cd contribution/checkstyle-tester "
+        - CMD11="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
+        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9$CMD10$CMD11
         - COVERAGE_CMD=""
     # NoExceptionTest - RxJava,java-design-patterns,MaterialDesignLibrary,apache-ant,apache-jsecurity,android-launcher (oraclejdk8)
     - jdk: oraclejdk8
@@ -163,10 +170,11 @@ matrix:
         - CMD08="&& sed -i 's/#android-launcher/android-launcher/' projects-for-travis.properties "
         - CMD09="&& sed -i 's/projects-to-test-on.properties/projects-for-travis.properties/' launch.sh "
         - CMD10="&& cd ../../ && mvn clean install -DskipTests -DskipITs -Dcobertura.skip=true "
-        - CMD11="                  -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD12="&& cd contribution/checkstyle-tester "
-        - CMD13="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
-        - CMD=$CMD01$CMD02$CMD03$CMD04$CMD05$CMD06$CMD07$CMD08$CMD09$CMD10$CMD11$CMD12$CMD13
+        - CMD11="                  -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD12="                  -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true "
+        - CMD13="&& cd contribution/checkstyle-tester "
+        - CMD14="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
+        - CMD=$CMD01$CMD02$CMD03$CMD04$CMD05$CMD06$CMD07$CMD08$CMD09$CMD10$CMD11$CMD12$CMD13$CMD14
         - COVERAGE_CMD=""
     # NoExceptionTest - Spring (oraclejdk8)
     - jdk: oraclejdk8
@@ -177,10 +185,11 @@ matrix:
         - CMD3=" && sed -i 's/#spring-framework/spring-framework/' projects-for-travis.properties "
         - CMD4=" && sed -i 's/projects-to-test-on.properties/projects-for-travis.properties/' launch.sh "
         - CMD5=" && cd ../../ && mvn clean install -DskipTests -DskipITs -Dcobertura.skip=true "
-        - CMD6="                   -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD7=" && cd contribution/checkstyle-tester "
-        - CMD8=" && ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8
+        - CMD6="                   -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD7="                   -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true "
+        - CMD8=" && cd contribution/checkstyle-tester "
+        - CMD9=" && ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
+        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9
         - COVERAGE_CMD=""
     # NoExceptionTest - Hbase (oraclejdk8)
     - jdk: oraclejdk8
@@ -191,18 +200,19 @@ matrix:
         - CMD3="&& sed -i 's/#Hbase/Hbase/' projects-for-travis.properties "
         - CMD4="&& sed -i 's/projects-to-test-on.properties/projects-for-travis.properties/' launch.sh "
         - CMD5="&& cd ../../ && mvn clean install -DskipTests -DskipITs -Dcobertura.skip=true "
-        - CMD6="                 -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.ant.skip=true "
-        - CMD7="&& cd contribution/checkstyle-tester "
-        - CMD8="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
-        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8
+        - CMD6="                 -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD7="                 -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true "
+        - CMD8="&& cd contribution/checkstyle-tester "
+        - CMD9="&& ./launch.sh -Dcheckstyle.config.location=checks-nonjavadoc-error.xml"
+        - CMD=$CMD1$CMD2$CMD3$CMD4$CMD5$CMD6$CMD7$CMD8$CMD9
         - COVERAGE_CMD=""
     # release dry run (oraclejdk8)
     - 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 "
-        - CMD3="-Dcheckstyle.ant.skip=true -Dgpg.skip=true'"
+        - CMD2="    -Dcobertura.skip=true -Dpmd.skip=true -Dfindbugs.skip=true "
+        - CMD3="    -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true -Dgpg.skip=true'"
         - CMD=$CMD1$CMD2$CMD3
         - COVERAGE_CMD=""
     # unit tests in German locale (oraclejdk8)
@@ -216,19 +226,19 @@ matrix:
     # checkstyle (openjdk7, oraclejdk7)
     - jdk: openjdk7
       env:
-        - DESC="checkstyle"
+        - DESC="checkstyle and sevntu-checkstyle"
         - CMD="mvn clean verify -DskipTests -DskipITs -Dpmd.skip=true -Dfindbugs.skip=true -Dcobertura.skip=true"
         - COVERAGE_CMD=""
     - jdk: oraclejdk7
       env:
-        - DESC="checkstyle"
+        - DESC="checkstyle and sevntu-checkstyle"
         - CMD="mvn clean verify -DskipTests -DskipITs -Dpmd.skip=true -Dfindbugs.skip=true -Dcobertura.skip=true"
         - COVERAGE_CMD=""
 
-    # MacOS verify
+    # MacOS verify (till cache is not working, we can not do verify)
     - os: osx
       env:
-        - DESC="MacOS verify"
+        - DESC="MacOS tests only"
         - CMD="export JAVA_HOME=$(/usr/libexec/java_home) && mvn clean integration-test failsafe:verify "
         - COVERAGE_CMD=""
 
@@ -262,7 +272,7 @@ after_success:
     then
         mvn -s config/deploy-settings.xml deploy \
           -DskipTests -DskipITs -Dpmd.skip=true -Dfindbugs.skip=true \
-          -Dcobertura.skip=true -Dcheckstyle.ant.skip=true ;
+          -Dcobertura.skip=true -Dcheckstyle.ant.skip=true -Dcheckstyle.skip=true ;
     fi
 
 cache:
diff --git a/pom.xml b/pom.xml
index edc60d6bb..5abd5c865 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1213,6 +1213,7 @@
         <skipTests>true</skipTests>
         <linkcheck.skip>true</linkcheck.skip>
         <maven.javadoc.skip>true</maven.javadoc.skip>
+        <checkstyle.skip>true</checkstyle.skip>
         <pmd.skip>true</pmd.skip>
         <findbugs.skip>true</findbugs.skip>
         <checkstyle.ant.skip>true</checkstyle.ant.skip>