diff --git a/.travis.yml b/.travis.yml
index 261e21dc70a..a50b205ec07 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ before_script:
   - avr-gcc --version
 script:
 - git rev-parse --short HEAD
-- make test:all
+- bash util/travis_test.sh
 - bash util/travis_build.sh
 - bash util/travis_docs.sh
 addons:
diff --git a/util/travis_test.sh b/util/travis_test.sh
new file mode 100644
index 00000000000..6c48f898ce5
--- /dev/null
+++ b/util/travis_test.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
+TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
+
+# test force push
+#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
+
+NUM_IMPACTING_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ecv '^(docs/)')
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+
+if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then
+    echo "Skipping due to commit message"
+    exit 0
+fi
+
+if [ "$BRANCH" != "master" ] && [ "$NUM_IMPACTING_CHANGES" == "0" ]; then
+    echo "Skipping due to changes not impacting tests"
+    exit 0
+fi
+
+make test:all