diff --git a/.travis.yml b/.travis.yml
index 80c729a772fed5..e496919579b2f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,14 @@ cache: ccache
 os: linux
 matrix:
   include:
+    - name: "First commit message adheres to guidelines at <a href=\"https://goo.gl/p2fr5Q\">https://goo.gl/p2fr5Q</a>"
+      if: type = pull_request
+      language: node_js
+      node_js: "node"
+      script:
+        - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
+            bash -x tools/lint-pr-commit-message.sh ${TRAVIS_PULL_REQUEST};
+          fi
     - name: "Linter"
       language: node_js
       node_js: "node"
@@ -11,10 +19,6 @@ matrix:
         - NODE=$(which node)
       script:
         - make lint
-        # Lint the first commit in the PR.
-        - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
-            bash tools/lint-pr-commit-message.sh ${TRAVIS_PULL_REQUEST} || true;
-          fi
     - name: "Test Suite"
       addons:
         apt: