diff --git a/java-bigquery/.cloudbuild/jdbc_nightly.yaml b/java-bigquery/.cloudbuild/jdbc_nightly.yaml
index 5c7acd472bab..db4ba3bd4724 100644
--- a/java-bigquery/.cloudbuild/jdbc_nightly.yaml
+++ b/java-bigquery/.cloudbuild/jdbc_nightly.yaml
@@ -24,24 +24,8 @@ steps:
   id: "IT Tests"
   timeout: 10000s
   entrypoint: 'bash'
-  args: ['.kokoro/build.sh']
-  env:
-  - 'JOB_TYPE=jdbc-integration'
+  args: ['java-bigquery/.cloudbuild/scripts/jdbc-nightly.sh']
   secretEnv: ['SA_EMAIL', 'KMS_RESOURCE_PATH', 'SA_SECRET']
-- name: 'gcr.io/cloud-devrel-public-resources/java11'
-  id: "IT Nightly Tests"
-  timeout: 10000s
-  entrypoint: 'bash'
-  args: ['.kokoro/build.sh']
-  env:
-  - 'JOB_TYPE=jdbc-nightly-integration'
-- name: 'gcr.io/cloud-devrel-public-resources/java11'
-  id: "Nightly build"
-  timeout: 10000s
-  entrypoint: 'bash'
-  args: ['.kokoro/jdbc-release.sh']
-  env:
-  - 'NIGHTLY_RELEASE_GCS_BUCKET=$_NIGHTLY_RELEASE_GCS_BUCKET'
 
 availableSecrets:
   secretManager:
diff --git a/java-bigquery/.cloudbuild/jdbc_presubmit.yaml b/java-bigquery/.cloudbuild/jdbc_presubmit.yaml
index c5896967ef89..c01f5fce569f 100644
--- a/java-bigquery/.cloudbuild/jdbc_presubmit.yaml
+++ b/java-bigquery/.cloudbuild/jdbc_presubmit.yaml
@@ -27,9 +27,7 @@ steps:
   id: "IT Tests"
   timeout: 2000s
   entrypoint: 'bash'
-  args: ['.kokoro/build.sh']
-  env:
-  - 'JOB_TYPE=${_JOB_TYPE}'
+  args: ['java-bigquery/.cloudbuild/scripts/jdbc-presubmit.sh']
   secretEnv: ['SA_EMAIL', 'KMS_RESOURCE_PATH', 'SA_SECRET']
 availableSecrets:
   secretManager:
diff --git a/java-bigquery/.cloudbuild/scripts/jdbc-nightly.sh b/java-bigquery/.cloudbuild/scripts/jdbc-nightly.sh
new file mode 100644
index 000000000000..1bccb96f03f7
--- /dev/null
+++ b/java-bigquery/.cloudbuild/scripts/jdbc-nightly.sh
@@ -0,0 +1,9 @@
+ROOT_FOLDER=$(git rev-parse --show-toplevel)
+
+cd ${ROOT_FOLDER}
+source .kokoro/common.sh
+install_modules java-bigquery
+
+cd ${ROOT_FOLDER}/java-bigquery/google-cloud-bigquery-jdbc
+make integration-test test=ITBigQueryJDBCTest
+make integration-test test=ITNightlyBigQueryTest
diff --git a/java-bigquery/.cloudbuild/scripts/jdbc-presubmit.sh b/java-bigquery/.cloudbuild/scripts/jdbc-presubmit.sh
new file mode 100644
index 000000000000..58164962a23f
--- /dev/null
+++ b/java-bigquery/.cloudbuild/scripts/jdbc-presubmit.sh
@@ -0,0 +1,8 @@
+ROOT_FOLDER=$(git rev-parse --show-toplevel)
+
+cd ${ROOT_FOLDER}
+source .kokoro/common.sh
+install_modules java-bigquery
+
+cd ${ROOT_FOLDER}/java-bigquery/google-cloud-bigquery-jdbc
+make integration-test test=ITBigQueryJDBCTest
diff --git a/java-bigquery/google-cloud-bigquery-jdbc/Makefile b/java-bigquery/google-cloud-bigquery-jdbc/Makefile
index 61521770c791..6adcb7e8a48d 100644
--- a/java-bigquery/google-cloud-bigquery-jdbc/Makefile
+++ b/java-bigquery/google-cloud-bigquery-jdbc/Makefile
@@ -28,7 +28,7 @@ unittest: |
 
 # Important: By default, this command will skip unittests.
 # To include unit tests, run: make integration-test skipSurefire=false
-integration-test: .check-env
+integration-test:
 	mvn -B -ntp \
 		-Penable-integration-tests \
 		-DtrimStackTrace=false \
@@ -45,7 +45,7 @@ unit-test-coverage:
 	BUILD_DIR=$$(mvn -B -ntp help:evaluate -Dexpression=project.build.directory -q -DforceStdout); \
 	cd $$BUILD_DIR/site && zip -r $$OLDPWD/jacoco-unittests.zip jacoco && cd $$OLDPWD
 
-full-coverage: .check-env
+full-coverage:
 	$(MAKE) integration-test skipSurefire=false test=ITBigQueryJDBCTest,ITNightlyBigQueryTest
 	mvn -B -ntp jacoco:report
 	BUILD_DIR=$$(mvn -B -ntp  help:evaluate -Dexpression=project.build.directory -q -DforceStdout); \