diff --git a/scripts/ci.js b/scripts/ci.js
index 28e6e6a47..9403784c2 100644
--- a/scripts/ci.js
+++ b/scripts/ci.js
@@ -48,10 +48,6 @@ task('NODE_UNIT', true, function () {
 task('NODE_INTEGRATION', true, function () {
   var branch = ENV.ES_REF;
 
-  if (branch === 'master' || branch.match(/^[3-9]/)) {
-    process.env.JAVA_HOME = '/usr/lib/jvm/jdk8';
-  }
-
   return node('scripts/generate', '--no-api', '--branch', branch)
   .then(function () {
     var target = (JENKINS ? 'jenkins_' : '') + 'integration:' + branch;
diff --git a/scripts/jenkins.sh b/scripts/jenkins.sh
index 3642e5000..486fa8824 100644
--- a/scripts/jenkins.sh
+++ b/scripts/jenkins.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export JAVA_HOME="/usr/lib/jvm/jdk8"
 lockpath="/var/lock/setup_nodejs"
 
 # pass a file name to aquire a lock
@@ -64,4 +65,4 @@ install_node "$NODE_V"
 npm install
 release_lock
 
-ES_PATH_REPO="./.es-snapshot-repos/$EXECUTOR_NUMBER/" ES_PORT=$((9400 + EXECUTOR_NUMBER)) RUN=NODE_UNIT,NODE_INTEGRATION VERBOSE=true node ./scripts/ci.js
\ No newline at end of file
+ES_PATH_REPO="./.es-snapshot-repos/$EXECUTOR_NUMBER/" ES_PORT=$((9400 + EXECUTOR_NUMBER)) RUN=NODE_UNIT,NODE_INTEGRATION VERBOSE=true node ./scripts/ci.js