diff --git a/.gitignore b/.gitignore
index 6f6fa035a9d4..7380f3d12c9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,8 @@ nosetests.xml
 .settings
 .DS_Store
 .classpath
+.factorypath
+logging.properties
 
 # Built documentation
 docs/
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
index 5fde7e9c1de4..0eb3d529196a 100644
--- a/google-cloud-bom/pom.xml
+++ b/google-cloud-bom/pom.xml
@@ -229,12 +229,6 @@
         <artifactId>google-cloud-bigtable</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-bigtable</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-bigtable-v2</artifactId>
@@ -250,12 +244,6 @@
         <artifactId>google-cloud-bigtable-admin</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-admin:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-bigtable-admin</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigtable-admin:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-bigtable-admin-v2</artifactId>
@@ -271,23 +259,11 @@
         <artifactId>google-cloud-bigquery</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-bigquery</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquery:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-bigquerydatatransfer</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerydatatransfer:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-bigquerydatatransfer</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-bigquerydatatransfer:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-bigquerydatatransfer-v1</artifactId>
@@ -303,23 +279,11 @@
         <artifactId>google-cloud-compute</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-compute:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-compute</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-compute:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-container</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-container:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-container</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-container:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-container-v1</artifactId>
@@ -335,12 +299,6 @@
         <artifactId>google-cloud-containeranalysis</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-containeranalysis:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-containeranalysis</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-containeranalysis:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-containeranalysis-v1beta1</artifactId>
@@ -356,22 +314,10 @@
         <artifactId>google-cloud-contrib</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-contrib:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-contrib</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-contrib:current} -->
-        <type>test-jar</type>
-      </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-nio</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-contrib:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-nio</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-contrib:current} -->
-        <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
@@ -389,34 +335,16 @@
         <artifactId>google-cloud-core-grpc</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-core-grpc:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-core-grpc</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-core-grpc:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-core-http</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-core-http:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-core-http</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-core-http:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-dataproc</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dataproc:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-dataproc</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dataproc:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dataproc-v1</artifactId>
@@ -442,12 +370,6 @@
         <artifactId>google-cloud-datastore</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-datastore</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-datastore:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-datastore-v1</artifactId>
@@ -458,12 +380,6 @@
         <artifactId>google-cloud-dlp</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-dlp</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-dlp:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dlp-v2</artifactId>
@@ -479,12 +395,6 @@
         <artifactId>google-cloud-dialogflow</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dialogflow:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-dialogflow</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dialogflow:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-dialogflow-v2beta1</artifactId>
@@ -510,23 +420,11 @@
         <artifactId>google-cloud-dns</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-dns</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-errorreporting</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-errorreporting:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-errorreporting</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-errorreporting:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-error-reporting-v1beta1</artifactId>
@@ -542,12 +440,6 @@
         <artifactId>google-cloud-firestore</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-firestore</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-firestore-v1beta1</artifactId>
@@ -563,12 +455,6 @@
         <artifactId>google-cloud-kms</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-kms:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-kms</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-kms:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-kms-v1</artifactId>
@@ -584,12 +470,6 @@
         <artifactId>google-cloud-language</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-language:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-language</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-language:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-language-v1</artifactId>
@@ -615,12 +495,6 @@
         <artifactId>google-cloud-logging</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-logging</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-logging-v2</artifactId>
@@ -636,18 +510,11 @@
         <artifactId>google-cloud-logging-logback</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging-logback:current} -->
       </dependency>
-
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-monitoring</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-monitoring:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-monitoring</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-monitoring:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-monitoring-v3</artifactId>
@@ -663,12 +530,6 @@
         <artifactId>google-cloud-os-login</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-os-login:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-os-login</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-os-login:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-os-login-v1</artifactId>
@@ -684,12 +545,6 @@
         <artifactId>google-cloud-pubsub</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-pubsub</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-pubsub-v1</artifactId>
@@ -705,12 +560,6 @@
         <artifactId>google-cloud-redis</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-redis:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-redis</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-redis:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-redis-v1beta1</artifactId>
@@ -736,23 +585,11 @@
         <artifactId>google-cloud-resourcemanager</artifactId>
         <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-resourcemanager</artifactId>
-        <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-resourcemanager:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanner</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-spanner</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-spanner-v1</artifactId>
@@ -788,12 +625,6 @@
         <artifactId>google-cloud-speech</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-speech</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-speech:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-speech-v1beta1</artifactId>
@@ -829,23 +660,11 @@
         <artifactId>google-cloud-storage</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-storage</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-tasks</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-tasks:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-tasks</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-tasks:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-tasks-v2beta2</artifactId>
@@ -871,12 +690,6 @@
         <artifactId>google-cloud-texttospeech</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-texttospeech:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-texttospeech</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-texttospeech:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-texttospeech-v1beta1</artifactId>
@@ -902,12 +715,6 @@
         <artifactId>google-cloud-trace</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-trace:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-trace</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-trace:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-trace-v1</artifactId>
@@ -933,23 +740,11 @@
         <artifactId>google-cloud-translate</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-translate:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-translate</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-translate:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-vision</artifactId>
         <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-vision:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-vision</artifactId>
-        <version>1.50.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-vision:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-vision-v1</artifactId>
@@ -995,12 +790,6 @@
         <artifactId>google-cloud-video-intelligence</artifactId>
         <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-video-intelligence:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-video-intelligence</artifactId>
-        <version>0.68.1-beta-SNAPSHOT</version><!-- {x-version-update:google-cloud-video-intelligence:current} -->
-        <type>test-jar</type>
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-video-intelligence-v1beta1</artifactId>
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
index 51ffb12addb5..6f6608a198c4 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
@@ -93,6 +93,11 @@
       <artifactId>grpc-testing</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit4</artifactId>
+	  <version>2.19.1</version>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>
@@ -125,6 +130,13 @@
           <perCoreThreadCount>true</perCoreThreadCount>
           <threadCount>2</threadCount>
         </configuration>
+		<dependencies>
+ 		  <dependency>
+ 			<groupId>org.apache.maven.surefire</groupId>
+ 			<artifactId>surefire-junit4</artifactId>
+			<version>2.19.1</version>
+ 		  </dependency>
+ 		</dependencies>
       </plugin>
     </plugins>
   </build>
diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index aab83ade66ef..8263e0e5a58b 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -96,6 +96,11 @@
       <artifactId>grpc-testing</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit4</artifactId>
+      <version>2.19.1</version>
+    </dependency>
   </dependencies>
   <profiles>
     <profile>
@@ -128,6 +133,13 @@
           <perCoreThreadCount>true</perCoreThreadCount>
           <threadCount>2</threadCount>
         </configuration>
+	<dependencies>
+	  <dependency>
+	    <groupId>org.apache.maven.surefire</groupId>
+	    <artifactId>surefire-junit4</artifactId>
+	    <version>2.19.1</version>
+	  </dependency>
+	</dependencies>
       </plugin>
     </plugins>
   </build>
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index f721bc0681c9..bb027fa5ab8e 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -88,5 +88,10 @@
       <classifier>testlib</classifier>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit4</artifactId>
+      <version>2.19.1</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/google-cloud-testing/google-cloud-managedtest/pom.xml b/google-cloud-testing/google-cloud-managedtest/pom.xml
index 0c8eb1bf6d13..e45e70661b0c 100644
--- a/google-cloud-testing/google-cloud-managedtest/pom.xml
+++ b/google-cloud-testing/google-cloud-managedtest/pom.xml
@@ -13,36 +13,21 @@
     <version>0.68.1-alpha-SNAPSHOT</version><!-- {x-version-update:google-cloud-testing:current} -->
   </parent>
 
-  <dependencies>
+ <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-bigquery</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-bigquery</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-compute</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-compute</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-nio</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-nio</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -58,142 +43,71 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-datastore</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-datastore</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-dns</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-dns</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-errorreporting</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-errorreporting</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-language</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-language</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-logging</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-logging</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-monitoring</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-monitoring</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-pubsub</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-resourcemanager</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-resourcemanager</artifactId>
-      <type>test-jar</type>
-    </dependency>
-
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-speech</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-speech</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-spanner</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-spanner</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-storage</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-storage</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-trace</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-trace</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-translate</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-translate</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-vision</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-vision</artifactId>
-      <type>test-jar</type>
-    </dependency>
 
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/google-cloud-util/pom.xml b/google-cloud-util/pom.xml
index 2c3f4502b734..b3f35a91276b 100644
--- a/google-cloud-util/pom.xml
+++ b/google-cloud-util/pom.xml
@@ -13,6 +13,19 @@
   <modules>
     <module>google-cloud-compat-checker</module>
   </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-surefire-plugin</artifactId>
+      <version>2.17</version>
+      <scope>test</scope>
+    </dependency>
+	<dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit4</artifactId>
+      <version>2.17</version>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>