diff --git a/.travis.yml b/.travis.yml
index 59abb97fa..952c3f0f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ addons:
     - oracle-java8-installer
     - oracle-java8-set-default
 
-after_script:
-  - echo $VAULT_PASSWORD > /tmp/vault
+script:
+  - ./mvnw package
   - ./deploy/deploy.sh
 env:
   global:
diff --git a/deploy/deploy.sh b/deploy/deploy.sh
index 45d59bebd..bbcb267fa 100755
--- a/deploy/deploy.sh
+++ b/deploy/deploy.sh
@@ -1,8 +1,17 @@
 #!/usr/bin/env bash
 
-virtualenv .
-. bin/activate
-pip install -r deploy/requirements.txt
-printf '[defaults]\nroles_path=../' >ansible.cfg
-ansible-galaxy install -p ../ -r deploy/requirements.yml
-ansible-playbook deploy/deploy.yml -vvvv --vault-password-file=/tmp/vault --extra-vars "wimpy_release_version=${TRAVIS_COMMIT} wimpy_deployment_environment=develop"
+set -v
+
+VAULT_FILE="/tmp/vault"
+DEPLOYMENT_ENVIRONMENT=${$1:=develop}
+
+# Only execute deployment if $TRAVIS is null (we are not on CI) or we are on CI merging to master and the build has ended successfully
+if [[ -z "${TRAVIS}" ]] || [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_TEST_RESULT}" == 0 && "${TRAVIS_BRANCH}" == 'master' ]]; then
+  echo "${VAULT_PASSWORD}" > "${VAULT_FILE}"
+  virtualenv .
+  . bin/activate
+  pip install -r deploy/requirements.txt
+  printf '[defaults]\nroles_path=../' >ansible.cfg
+  ansible-galaxy install -p ../ -r deploy/requirements.yml
+  ansible-playbook deploy/deploy.yml -vvvv --vault-password-file="${VAULT_FILE}" --extra-vars "wimpy_release_version=${TRAVIS_COMMIT} wimpy_deployment_environment=${DEPLOYMENT_ENVIRONMENT}"
+fi