diff --git a/.travis.yml b/.travis.yml
index 18b04e2e2e6..4a6ad230fea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,11 @@ before_install:
   - gem install xcpretty
   - bundle exec pod install --project-directory=Example --repo-update
   - bundle exec pod install --project-directory=Firestore/Example --no-repo-update
+  - brew install clang-format
 
 script:
   - "! git grep -I ' $'" # Fail on trailing whitespace in non-binary files
+  - ./scripts/style.sh test-only # Validate clang-format compliance
   - ./test.sh
 
 # TODO fix os_log deprecation warning in FIRLogger to remove --allow-warnings
diff --git a/scripts/style.sh b/scripts/style.sh
index 72f7520a138..116c872823f 100755
--- a/scripts/style.sh
+++ b/scripts/style.sh
@@ -57,6 +57,9 @@ fi
 \%/third_party/% d
 \%/Firestore/Port/% d
 
+# Sources pulled in by travis bundler
+\%/vendor/bundle/% d
+
 # Sources within the tree that are not subject to formatting
 \%^./(Example|Firebase)/(Auth|AuthSamples|Database|Messaging)/% d