diff --git a/.travis.yml b/.travis.yml
index 1cc076b3c2..dda1644cfa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: ruby
 matrix:
   include:
     - os: osx
-      osx_image: xcode8.0
+      osx_image: xcode8.1
       rvm: system
     - os: linux
       rvm: 2.0.0
@@ -13,7 +13,7 @@ before_install:
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
       HOMEBREW_REPOSITORY="$(brew --repo)";
       sudo rm -rf "$HOMEBREW_REPOSITORY";
-      ln -s "$PWD" "$HOMEBREW_REPOSITORY";
+      sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY";
     else
       export PATH="$PWD/bin:$PATH";
       umask 022;
diff --git a/Library/Homebrew/cask/cmd/brew-cask-tests.rb b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
index 0bfc4b037f..43683a2634 100755
--- a/Library/Homebrew/cask/cmd/brew-cask-tests.rb
+++ b/Library/Homebrew/cask/cmd/brew-cask-tests.rb
@@ -24,7 +24,11 @@ repo_root.cd do
   rspec = ARGV.flag?("--rspec") || !ARGV.flag?("--minitest")
   minitest = ARGV.flag?("--minitest") || !ARGV.flag?("--rspec")
 
-  ENV["HOMEBREW_TESTS_COVERAGE"] = "1" if ARGV.flag?("--coverage")
+  p [:coverage, ARGV.flag?("--coverage"), ENV["CI"], ENV["TRAVIS"]]
+  if ARGV.flag?("--coverage")
+    ENV["HOMEBREW_TESTS_COVERAGE"] = "1"
+    upload_coverage = ENV["CODECOV_TOKEN"] || ENV["TRAVIS"]
+  end
 
   failed = false
 
@@ -46,7 +50,8 @@ repo_root.cd do
 
   Homebrew.failed = failed
 
-  if ENV["CODECOV_TOKEN"]
+  if upload_coverage
+    puts "Submitting Codecov coverage..."
     system "bundle", "exec", "rake", "test:coverage:upload"
   end
 end