diff --git a/dist/tools/travis-scripts/build_and_test.sh b/dist/tools/travis-scripts/build_and_test.sh
index 475ad9f1af8e..5f5d497335ce 100755
--- a/dist/tools/travis-scripts/build_and_test.sh
+++ b/dist/tools/travis-scripts/build_and_test.sh
@@ -27,9 +27,10 @@ then
     if [ "$BUILDTEST_MCU_GROUP" == "static-tests" ]
     then
         RESULT=0
-
-        git rebase master || git rebase --abort
-        RESULT=$(set_result $? $RESULT)
+        if [ "$BUILDTEST_NO_REBASE" != "1" ]; then
+            git rebase master || git rebase --abort
+            RESULT=$(set_result $? $RESULT)
+        fi
 
         ./dist/tools/whitespacecheck/check.sh master
         RESULT=$(set_result $? $RESULT)