diff --git a/.travis.yml b/.travis.yml
index 4383d49f548..c01b0750360 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,7 @@ python:
   - 3.4
   - 3.5
 install:
-  # Validate requirements_all.txt on Python 3.4
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then python3 setup.py -q develop 2>/dev/null; tput setaf 1; script/gen_requirements_all.py validate; tput sgr0; fi
-  - script/bootstrap_server
+  - "true"
 script:
   - script/cibuild
 matrix:
diff --git a/script/cibuild b/script/cibuild
index beb7b22693d..11d91415405 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -5,6 +5,28 @@
 
 cd "$(dirname "$0")/.."
 
+if [ "$TRAVIS_PYTHON_VERSION" = "3.5" ]; then
+  echo "Verifying requirements_all.txt..."
+  python3 setup.py -q develop 2> /dev/null
+  tput setaf 1
+  script/gen_requirements_all.py validate
+  VERIFY_REQUIREMENTS_STATUS=$?
+  tput sgr0
+else
+  VERIFY_REQUIREMENTS_STATUS=0
+fi
+
+if [ "$VERIFY_REQUIREMENTS_STATUS" != "0" ]; then
+  exit $VERIFY_REQUIREMENTS_STATUS
+fi
+
+script/bootstrap_server > /dev/null
+DEP_INSTALL_STATUS=$?
+
+if [ "$DEP_INSTALL_STATUS" != "0" ]; then
+  exit $DEP_INSTALL_STATUS
+fi
+
 if [ "$TRAVIS_PYTHON_VERSION" != "3.5" ]; then
   NO_LINT=1
 fi
diff --git a/script/test b/script/test
index 25873492001..6a78ce42d41 100755
--- a/script/test
+++ b/script/test
@@ -5,13 +5,6 @@
 
 cd "$(dirname "$0")/.."
 
-if [ "$NO_LINT" = "1" ]; then
-  LINT_STATUS=0
-else
-  script/lint
-  LINT_STATUS=$?
-fi
-
 echo "Running tests..."
 
 if [ "$1" = "coverage" ]; then
@@ -22,6 +15,13 @@ else
   TEST_STATUS=$?
 fi
 
+if [ "$NO_LINT" = "1" ]; then
+  LINT_STATUS=0
+else
+  script/lint
+  LINT_STATUS=$?
+fi
+
 if [ $LINT_STATUS -eq 0 ]
 then
   exit $TEST_STATUS