diff --git a/java-bigquery-jdbc/Makefile b/java-bigquery-jdbc/Makefile
index 827cbcd94058..d3c1f014eff4 100644
--- a/java-bigquery-jdbc/Makefile
+++ b/java-bigquery-jdbc/Makefile
@@ -70,7 +70,7 @@ package:
 	cp target/google-cloud-bigquery-jdbc-*-all.jar $(PACKAGE_DESTINATION)/
 
 build-it-standalone:
-	mvn -Dmaven.test.skip=true package -f pom-it.xml
+	mvn -Dmaven.test.skip=true package -f pom-it.xml -Dbigquery-jdbc.version=$(JDBC_DRIVER_VERSION)
 
 run-it-standalone:
 	java -cp $(JDBC_JAR):target-it/* org.junit.platform.console.ConsoleLauncher --select-class com.google.cloud.bigquery.jdbc.it.suites.ITDriverAgnosticTests
diff --git a/java-bigquery-jdbc/pom-it.xml b/java-bigquery-jdbc/pom-it.xml
index 3b6ae457bcee..75c8e3016fae 100644
--- a/java-bigquery-jdbc/pom-it.xml
+++ b/java-bigquery-jdbc/pom-it.xml
@@ -14,6 +14,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.source>8</maven.compiler.source>
     <maven.compiler.target>8</maven.compiler.target>
+    <bigquery-jdbc.version>1.2.0-SNAPSHOT</bigquery-jdbc.version><!-- {x-version-update:google-cloud-bigquery-jdbc:current} -->
   </properties>
 
   <dependencies>
@@ -21,7 +22,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-bigquery-jdbc</artifactId>
-      <version>1.0.0</version><!-- {x-version-update:google-cloud-bigquery-jdbc:current} -->
+      <version>${bigquery-jdbc.version}</version>
       <type>test-jar</type>
       <scope>compile</scope>
     </dependency>
@@ -88,6 +89,20 @@
   <build>
     <directory>target-it</directory>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <phase>none</phase>
+          </execution>
+          <execution>
+            <id>default-testCompile</id>
+            <phase>none</phase>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -99,21 +114,26 @@
               <goal>shade</goal>
             </goals>
             <configuration>
-              <!--
-                We exclude the main bigquery-jdbc framework classes.
-                This jar should ONLY contain tests and their dependencies (Junit, Mockito, Truth),
-                plus the test classes themselves. When running, the ACTUAL JDBC driver jar
-                will be placed on the classpath. 
-              -->
               <createDependencyReducedPom>false</createDependencyReducedPom>
-              <artifactSet>
-                <excludes>
-                  <exclude>com.google.cloud:google-cloud-bigquery</exclude>
-                  <exclude>com.google.cloud:google-cloud-bigquerystorage</exclude>
-                  <exclude>io.grpc:*</exclude>
-                  <exclude>com.google.protobuf:*</exclude>
-                </excludes>
-              </artifactSet>
+              <!-- Shading everything except junit & integration tests to avoid version conflicts -->
+              <relocations>
+                <relocation>
+                  <pattern>com.</pattern>
+                  <shadedPattern>com.google.bqjdbc.shaded.com.</shadedPattern>
+                  <excludes>com.google.cloud.bigquery.jdbc.it.**</excludes>
+                </relocation>
+                <relocation>
+                  <pattern>org.</pattern>
+                  <shadedPattern>com.google.bqjdbc.shaded.org.</shadedPattern>
+                  <excludes>
+                    <exclude>org.junit.**</exclude>
+                  </excludes>
+                </relocation>
+                <relocation>
+                  <pattern>io.</pattern>
+                  <shadedPattern>com.google.bqjdbc.shaded.io.</shadedPattern>
+                </relocation>
+              </relocations>
               <filters>
                 <filter>
                   <artifact>*:*</artifact>
diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBaseTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBaseTest.java
index 8be466e8178c..2529c1bff75a 100644
--- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBaseTest.java
+++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBaseTest.java
@@ -17,10 +17,12 @@
 package com.google.cloud.bigquery.jdbc;
 
 import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.BigQueryOptions;
 import com.google.cloud.bigquery.jdbc.utils.TestUtilities;
 import com.google.cloud.bigquery.jdbc.utils.URIBuilder;
+import java.lang.reflect.Method;
+import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.SQLException;
 
 public class BigQueryJdbcBaseTest {
 
@@ -48,12 +50,18 @@ public class BigQueryJdbcBaseTest {
 
   protected static BigQuery getBigQuery(String connectionUrl) {
     try {
-      return DriverManager.getConnection(connectionUrl)
-          .unwrap(BigQueryConnection.class)
-          .getBigQuery();
-    } catch (SQLException e) {
-      throw new RuntimeException("Failed to initialize BigQuery client", e);
+      Class<?> bqConnClass = Class.forName("com.google.cloud.bigquery.jdbc.BigQueryConnection");
+      Connection conn = DriverManager.getConnection(connectionUrl);
+      Object unwrapped = conn.unwrap(bqConnClass);
+      if (unwrapped != null) {
+        Method method = bqConnClass.getDeclaredMethod("getBigQuery");
+        method.setAccessible(true);
+        return (BigQuery) method.invoke(unwrapped);
+      }
+    } catch (Throwable e) {
+      // ignore for some set of tests; Proxy/TPC tests will fail if it doesn't work.
     }
+    return BigQueryOptions.getDefaultInstance().getService();
   }
 
   protected static URIBuilder getBaseUri() {