diff --git a/.travis.yml b/.travis.yml
index 077a5968b8..084e7799b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,18 +6,18 @@ install: ./ci/install
 
 script:
   - npm install
-  - '[ "${TRAVIS_OS_NAME}" = "linux" ] && npm test || false'
-  - '[ "${TRAVIS_OS_NAME}" = "linux" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false'
-  - '[ "${TRAVIS_OS_NAME}" = "osx" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./ci/release-mac || false'
+  - npm test
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && npm run integration || false'
+  - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && ./ci/release || false'
 
 matrix:
   include:
-    - os: linux
-      services:
-        - docker
-      language: node_js
-      node_js:
-        - "4.1"
+     - os: linux
+       services:
+         - docker
+       language: node_js
+       node_js:
+         - "4.1"
     - os: osx
       language: generic
 
diff --git a/ci/release b/ci/release
index 4ab8348ace..71d763e80f 100755
--- a/ci/release
+++ b/ci/release
@@ -1,5 +1,12 @@
-echo $MAC_KEY_CONTENT > mac_key_content.hex && xxd -p -r mac_key_content.hex ~/Library/Keychains/keychain.keychain && rm mac_key_content.hex
-security unlock-keychain -p "$MAC_KEY_SECRET" ~/Library/Keychains/keychain.keychain
-security default-keychain -s keychain.keychain
-security list-keychains
-npm run release-mac
+#!/bin/bash
+
+if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+  echo $MAC_KEY_CONTENT > mac_key_content.hex && xxd -p -r mac_key_content.hex ~/Library/Keychains/keychain.keychain && rm mac_key_content.hex
+  security unlock-keychain -p "$MAC_KEY_SECRET" ~/Library/Keychains/keychain.keychain
+  security default-keychain -s keychain.keychain
+  security list-keychains
+  npm run release-mac
+else
+  echo "Skipped for now"
+fi
+