diff --git a/.travis.yml b/.travis.yml
index 79ce8e4ac..66a87cae2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,8 @@ cache:
   directories:
     - $HOME/.ivy2/cache
     - $HOME/.sbt
-    
+    - $HOME/.protobuf-2.6.1/src
+
 install:
   - wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
   - tar -xzvf protobuf-2.6.1.tar.gz
@@ -27,10 +28,9 @@ before_cache:
 jobs:  
   include:
     - stage: "Verify"
-      script: sbt ++$TRAVIS_SCALA_VERSION ";validate;"
-      script: sbt ++$TRAVIS_SCALA_VERSION ";verify;"
-      script: ./bin/func-test-api.sh # run func tests in parallel
-
-
-script:
-  - sbt ++$TRAVIS_SCALA_VERSION ";validate;verify"
+      script: sbt ++$TRAVIS_SCALA_VERSION ";validate-api; validate-core; verify-api"
+      name: "Validate and verify API"
+    - script: sbt ++$TRAVIS_SCALA_VERSION ";validate-portal; verify-portal"
+      name: "Validate and verify portal"
+    - script: ./bin/func-test-portal.sh
+      name: "Run portal functional tests"
diff --git a/build.sbt b/build.sbt
index f3670f864..2582d1a0b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -288,6 +288,8 @@ addCommandAlias("validate-portal",
 addCommandAlias("validate", ";validate-core;validate-api;validate-portal")
 
 // Verify runs all tests and code coverage
+addCommandAlias("verify-api", ";project api; test")
+addCommandAlias("verify-portal", ";project portal; test")
 addCommandAlias("verify",
   ";project api;dockerComposeUp;project root;coverage;test;it:test;coverageReport;coverageAggregate;project api;dockerComposeStop")
 
@@ -295,5 +297,3 @@ addCommandAlias("verify",
 addCommandAlias("build-api", ";project api;clean;assembly")
 addCommandAlias("build-portal", ";project portal;clean;preparePortal;dist")
 addCommandAlias("build", ";build-api;build-portal")
-
-