diff --git a/.travis.yml b/.travis.yml
index 123568d3cb..ca4772639c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,18 +9,11 @@ env:
     - GOPROXY=https://proxy.golang.org
 matrix:
   include:
-    - language: go
-      name: Check Boilerplate 
-      go: 1.12.12
-      env:
-        - TESTSUITE=boilerplate
-      script: make test
-
     - language: go
       name: Code Lint
       go: 1.12.12
       env:
-        - TESTSUITE=lint
+        - TESTSUITE=lintall
       before_install:
         - sudo apt-get install -y libvirt-dev
       script: make test
@@ -33,10 +26,15 @@ matrix:
       before_install:
         - sudo apt-get install -y libvirt-dev
       script: make test
+
+    - language: go
+      name: Build
+      go: 1.12.12
+      script: make
 after_success:
   - bash <(curl -s https://codecov.io/bash)
-travisBuddy:	
-    regex: (FAIL:|\.go:\d+:|^panic:|failed$)	
+travisBuddy:
+    regex: (FAIL:|\.go:\d+:|^panic:|failed$)
 notifications:
   webhooks:
     urls:
diff --git a/test.sh b/test.sh
index 846ed3e575..463cca159f 100755
--- a/test.sh
+++ b/test.sh
@@ -19,7 +19,7 @@ set -eu -o pipefail
 TESTSUITE="${TESTSUITE:-all}" # if env variable not set run all the tests
 exitcode=0
 
-if [[ "$TESTSUITE" = "lint" ]] || [[ "$TESTSUITE" = "all" ]]
+if [[ "$TESTSUITE" = "lint" ]] || [[ "$TESTSUITE" = "all" ]] || [[ "$TESTSUITE" = "lintall" ]]
 then
     echo "= make lint ============================================================="
     make -s lint-ci && echo ok || ((exitcode += 4))
@@ -30,7 +30,7 @@ fi
 
 
 
-if [[ "$TESTSUITE" = "boilerplate" ]] || [[ "$TESTSUITE" = "all" ]]
+if [[ "$TESTSUITE" = "boilerplate" ]] || [[ "$TESTSUITE" = "all" ]] || [[ "$TESTSUITE" = "lintall" ]]
 then
     echo "= boilerplate ==========================================================="
     readonly ROOT_DIR=$(pwd)
@@ -50,7 +50,7 @@ fi
 
 
 if [[ "$TESTSUITE" = "unittest" ]] || [[ "$TESTSUITE" = "all" ]]
-then 
+then
     echo "= schema_check =========================================================="
     go run deploy/minikube/schema_check.go >/dev/null && echo ok || ((exitcode += 16))