diff --git a/.travis.yml b/.travis.yml
index f76ff21af086b0cea1933c6fdf27a02c90a2203c..51c6265534387ffbf7b683a3e2dc0ee15c234e49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: go
 
 go:
-  - 1.7
-  - 1.8
+  - '1.7'
+  - '1.8'
 
 os:
   - linux
@@ -12,7 +12,7 @@ matrix:
   include:
     - env: TARGET=x86_64-linux-musl
       os: linux
-      go: 1.8
+      go: '1.8'
 
 addons:
   apt:
@@ -47,9 +47,9 @@ before_install:
       fi
       popd
     fi
-  - PATH=$PATH:$HOME/cross/$TARGET/bin
   - |
     if [ -n "$TARGET" ]; then
+      PATH=$PATH:$HOME/cross/$TARGET/bin
       export CC="$TARGET-gcc"
       export CXX="$TARGET-g++"
       export GO_LDFLAGS='-linkmode external -extldflags=-static'
@@ -60,25 +60,29 @@ install:
 
 script:
   - make VERSION=${TRAVIS_TAG:-build-$TRAVIS_BUILD_ID}
-  - make test
-  - make vet
-  - "ldd ./kubecfg || :"
+  - make VERSION=${TRAVIS_TAG:-build-$TRAVIS_BUILD_ID} test
+  - make VERSION=${TRAVIS_TAG:-build-$TRAVIS_BUILD_ID} vet
+  - >
+    ldd ./kubecfg || otool -L ./kubecfg || :
   - ./kubecfg help
   - ./kubecfg version
 
 after_script: set +e
 
 before_deploy:
-  - cp kubecfg $TARGET-kubecfg
-  - strip $TARGET-kubecfg && ./$TARGET-kubecfg version
-  - "size $TARGET-kubecfg || :"
+  - EXE_NAME=kubecfg-$(go env GOOS)-$(go env GOARCH)
+  - cp kubecfg $EXE_NAME
+  - strip $EXE_NAME && ./$EXE_NAME version
+  - >
+    size $EXE_NAME || :
 
 deploy:
   api_key:
     secure: "T/LpWZSgeqWBgY3mUNeej55n8TbZZM7UgrHl7pej1CE2cs6YGcfyog3peiXvCcVF9NhGsm6eTXZQeFxsuWgMbWYeqlBnMkHNPPqdNpeRFgY0TkFZXHZLexfqTo2MLgrZiJ+bZl8wZnTTXukieGeLE37ugkBJyceLyfqIaxwRlpDzKPn8XtIqOMOwMq0aeUA8wjSSpuWkuwlGWKwJtI48BNExZZ1FRpPHQdAZjX6zEPT2SuRaACZdoX+3k/Fr91H6O9TplE4q5eCpEdd3y7BGGtMm3WA70SxYIZPGzfwaALGja5BapZr9Eui6ppyPGesQ8zV+zNtOsnK5Phj3QUj8M+v4BmJbxbPyhAIWmFiDlutgwZUkXI+R+SXONy1/LTuLLNSJ9WPQsC9gL09FGQmg+X0s7VpJVWxD8FScY0DJ4/bNLgeWnzwT2YTsduDktqevMpetxJWZGVQx3EN595JJKlZGtE8PouzVm7sRQEfe3Jd0XIcPfj5AV5trEBDjgHZSnU4qa9G9RdUZfswVp+R7SEwoTwEIEyOpFAwi9Qg5wkCAZFU2+86LQOLYH0Pm38//RxSXJEF1abkEb0Y/awz6KKlGBK3z1VSXvK3LQ8r9SwF2h15rD74O1mGM8Mjbs+mJXPxKpCq+BslskRYur3F8tRx45pwr8Ly9dppZd2rrswI="
-  file: $TARGET-kubecfg
+  file: $EXE_NAME
   on:
-    condition: $TARGET = x86_64-linux-musl
+    condition: $TARGET = x86_64-linux-musl || $TRAVIS_OS_NAME = osx
+    go: '1.8'
     tags: true
   provider: releases
   skip_cleanup: true