diff --git a/.travis.yml b/.travis.yml
index f49aa18..6dc9030 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,7 @@ dist: trusty
 osx_image: xcode9
 before_install:
     - if [ $TRAVIS_OS_NAME == "osx" ]; then
-            brew tap vapor/tap;
-            brew update;
-            brew install vapor;
+            HOMEBREW_NO_AUTO_UPDATE=1 brew install vapor/tap/vapor;
         else
             eval "$(curl -sL https://apt.vapor.sh)";
             sudo apt-get install vapor;
@@ -21,6 +19,13 @@ script:
     - swift build
     - swift build -c release
     - swift test
+    - if [ $TRAVIS_OS_NAME != "osx" ]; then
+            sudo apt-get remove vapor;
+            sudo apt-get install swift=3.1.1;
+            swift build;
+            swift build -c release;
+            swift test;
+        fi
 
 after_success:
-    - eval "$(curl -sL https://swift.vapor.sh/codecov)"
+    - eval "$(curl -sL https://raw.githubusercontent.com/vapor-community/swift/master/codecov)"