diff --git a/.travis.yml b/.travis.yml
index b4673dfc6..c1a7bf55d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,11 +15,14 @@ services:
 
 jobs:
     include:
+      - stage: "Tests"
+        name: "Checkstyle"
+        script: bash scripts/runCheckstyle.sh
       - stage: "Tests"
         name: "Unit tests"
         before_script: bash scripts/prepareTestEnv.sh
         script: bash scripts/runTests.sh
-	after_success: bash scripts/sonar.sh
+        after_success: bash scripts/sonar.sh
       - stage: "System Tests"
         name: "Test environment setup"
         script: bash scripts/prepareServerJars.sh
diff --git a/scripts/runCheckstyle.sh b/scripts/runCheckstyle.sh
new file mode 100644
index 000000000..0751bd510
--- /dev/null
+++ b/scripts/runCheckstyle.sh
@@ -0,0 +1,4 @@
+cd $HOME/Plan
+gradle checkstyleMain
+gradle checkstyleTest
+cd $HOME