diff --git a/.travis.yml b/.travis.yml
index 6259aca2..7ab53a4d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,15 +59,19 @@ script:
   - platformio update
 # Run the builds (Mega must be last so that the hex file isn't cleaned up)
   - platformio run -e teensy35 -e teensy40 -e megaatmega2560
-# Run the remote unit tests
-  - platformio remote test --environment megaatmega2560
-# The uploading of the firmware and doxygen files are only performed on the master branch
+# Run the remote unit tests (only on master)
+  - 'if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then platformio remote test --environment megaatmega2560; fi'
+# Uploading the firmware to speeduino.com (Only on master)
   - |
     if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
       # Upload ini and hex files to speeduino.com server
       curl -v https://speeduino.com:2078 || true
       curl -v --tlsv1.2 --ipv4 --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./.pio/build/megaatmega2560/firmware.hex" "https://speeduino.com:2078/bin/master.hex"
       curl --tlsv1.2 --ipv4 --user "speeduino_firmware@speeduino.com:$WEB_PWD" --basic -T "./reference/speeduino.ini" "https://speeduino.com:2078/master.ini"
+    fi
+#Build the doxygen documentation and commit to its repo (Only on master)
+  - |
+    if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
       # Do doxygen run and upload to gh-pages server.
       doxygen
       cd ..