diff --git a/google-cloud-clients/google-cloud-asset/pom.xml b/google-cloud-clients/google-cloud-asset/pom.xml
index 68fc142fbb85..bb65b3342d78 100644
--- a/google-cloud-clients/google-cloud-asset/pom.xml
+++ b/google-cloud-clients/google-cloud-asset/pom.xml
@@ -42,12 +42,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -58,6 +54,7 @@
       <artifactId>grpc-google-cloud-asset-v1beta1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-automl/pom.xml b/google-cloud-clients/google-cloud-automl/pom.xml
index ee3004395cda..79aaece41291 100644
--- a/google-cloud-clients/google-cloud-automl/pom.xml
+++ b/google-cloud-clients/google-cloud-automl/pom.xml
@@ -42,12 +42,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -58,6 +54,7 @@
       <artifactId>grpc-google-cloud-automl-v1beta1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-bigquery/pom.xml b/google-cloud-clients/google-cloud-bigquery/pom.xml
index fe0b3bb15eca..515c99a99eac 100644
--- a/google-cloud-clients/google-cloud-bigquery/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquery/pom.xml
@@ -41,6 +41,8 @@
       <artifactId>google-api-services-bigquery</artifactId>
       <scope>compile</scope>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
diff --git a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
index 7303c3f481a9..52fcb96041d6 100644
--- a/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerydatatransfer/pom.xml
@@ -47,12 +47,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -78,6 +74,7 @@
       <artifactId>grpc-google-iam-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-bigquerystorage/pom.xml b/google-cloud-clients/google-cloud-bigquerystorage/pom.xml
index 22d6c7344fec..b8f04296f341 100644
--- a/google-cloud-clients/google-cloud-bigquerystorage/pom.xml
+++ b/google-cloud-clients/google-cloud-bigquerystorage/pom.xml
@@ -34,11 +34,14 @@
             <groupId>com.google.api.grpc</groupId>
             <artifactId>grpc-google-cloud-bigquerystorage-v1beta1</artifactId>
         </dependency>
+
+        <!-- Test dependencies -->
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax-grpc</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Need testing utility classes for generated gRPC clients tests -->
         <dependency>
             <groupId>com.google.api</groupId>
             <artifactId>gax-grpc</artifactId>
@@ -50,7 +53,6 @@
             <artifactId>gax</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
index 851e8d872d2b..47a20d597c4f 100644
--- a/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable-admin/pom.xml
@@ -54,13 +54,7 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- Test -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+    <!-- Test dependencies -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
@@ -82,6 +76,7 @@
       <artifactId>truth</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-bigtable/pom.xml b/google-cloud-clients/google-cloud-bigtable/pom.xml
index 3485be86cbbe..bbc2cf0d7575 100644
--- a/google-cloud-clients/google-cloud-bigtable/pom.xml
+++ b/google-cloud-clients/google-cloud-bigtable/pom.xml
@@ -53,13 +53,7 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- Test -->
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+    <!-- Test dependencies -->
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-cloud-bigtable-v2</artifactId>
@@ -85,6 +79,7 @@
       <artifactId>truth</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-compute/pom.xml b/google-cloud-clients/google-cloud-compute/pom.xml
index c7f6461afc6d..e3c01b335c1c 100644
--- a/google-cloud-clients/google-cloud-compute/pom.xml
+++ b/google-cloud-clients/google-cloud-compute/pom.xml
@@ -31,6 +31,8 @@
       <artifactId>google-api-services-compute</artifactId>
       <scope>compile</scope>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
diff --git a/google-cloud-clients/google-cloud-container/pom.xml b/google-cloud-clients/google-cloud-container/pom.xml
index d19e272b63dd..d243ce848dcb 100644
--- a/google-cloud-clients/google-cloud-container/pom.xml
+++ b/google-cloud-clients/google-cloud-container/pom.xml
@@ -47,12 +47,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -78,6 +74,7 @@
       <artifactId>grpc-google-iam-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-containeranalysis/pom.xml b/google-cloud-clients/google-cloud-containeranalysis/pom.xml
index bbe40263336c..45f2c9107225 100644
--- a/google-cloud-clients/google-cloud-containeranalysis/pom.xml
+++ b/google-cloud-clients/google-cloud-containeranalysis/pom.xml
@@ -45,6 +45,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -55,6 +57,7 @@
       <artifactId>grpc-google-cloud-containeranalysis-v1beta1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-core-grpc/pom.xml b/google-cloud-clients/google-cloud-core-grpc/pom.xml
index f2aa52050930..ce6a5b6b933c 100644
--- a/google-cloud-clients/google-cloud-core-grpc/pom.xml
+++ b/google-cloud-clients/google-cloud-core-grpc/pom.xml
@@ -77,6 +77,8 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
diff --git a/google-cloud-clients/google-cloud-core-http/pom.xml b/google-cloud-clients/google-cloud-core-http/pom.xml
index 7acb0241f74f..0dd0cce0e80a 100644
--- a/google-cloud-clients/google-cloud-core-http/pom.xml
+++ b/google-cloud-clients/google-cloud-core-http/pom.xml
@@ -63,6 +63,8 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax-httpjson</artifactId>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/google-cloud-clients/google-cloud-dataproc/pom.xml b/google-cloud-clients/google-cloud-dataproc/pom.xml
index d33e22dacae0..05452af91aaf 100644
--- a/google-cloud-clients/google-cloud-dataproc/pom.xml
+++ b/google-cloud-clients/google-cloud-dataproc/pom.xml
@@ -54,12 +54,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -85,6 +81,7 @@
       <artifactId>grpc-google-iam-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-datastore/pom.xml b/google-cloud-clients/google-cloud-datastore/pom.xml
index c48264e58b1a..9f0ea6662064 100644
--- a/google-cloud-clients/google-cloud-datastore/pom.xml
+++ b/google-cloud-clients/google-cloud-datastore/pom.xml
@@ -38,6 +38,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-core</artifactId>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
diff --git a/google-cloud-clients/google-cloud-dialogflow/pom.xml b/google-cloud-clients/google-cloud-dialogflow/pom.xml
index fff5a7a5d9e1..11ae4c47e4dc 100644
--- a/google-cloud-clients/google-cloud-dialogflow/pom.xml
+++ b/google-cloud-clients/google-cloud-dialogflow/pom.xml
@@ -46,12 +46,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -77,6 +73,7 @@
       <artifactId>grpc-google-cloud-dialogflow-v2</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-dlp/pom.xml b/google-cloud-clients/google-cloud-dlp/pom.xml
index d287fc32a329..1f62572884ba 100644
--- a/google-cloud-clients/google-cloud-dlp/pom.xml
+++ b/google-cloud-clients/google-cloud-dlp/pom.xml
@@ -42,12 +42,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -68,6 +64,7 @@
       <artifactId>grpc-google-cloud-dlp-v2</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-dns/pom.xml b/google-cloud-clients/google-cloud-dns/pom.xml
index 2a37366cf2df..b2c7242333a8 100644
--- a/google-cloud-clients/google-cloud-dns/pom.xml
+++ b/google-cloud-clients/google-cloud-dns/pom.xml
@@ -37,6 +37,8 @@
       <groupId>commons-fileupload</groupId>
       <artifactId>commons-fileupload</artifactId>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
diff --git a/google-cloud-clients/google-cloud-errorreporting/pom.xml b/google-cloud-clients/google-cloud-errorreporting/pom.xml
index b4bc08d425cb..d332edf87912 100644
--- a/google-cloud-clients/google-cloud-errorreporting/pom.xml
+++ b/google-cloud-clients/google-cloud-errorreporting/pom.xml
@@ -42,12 +42,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -68,6 +64,7 @@
       <artifactId>grpc-google-cloud-error-reporting-v1beta1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-firestore/pom.xml b/google-cloud-clients/google-cloud-firestore/pom.xml
index ce326c6d5fe6..6f5a32384305 100644
--- a/google-cloud-clients/google-cloud-firestore/pom.xml
+++ b/google-cloud-clients/google-cloud-firestore/pom.xml
@@ -71,12 +71,8 @@
       <groupId>io.opencensus</groupId>
       <artifactId>opencensus-contrib-grpc-util</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -87,6 +83,7 @@
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-iot/pom.xml b/google-cloud-clients/google-cloud-iot/pom.xml
index 0359e51d71fd..c260c032e7d9 100644
--- a/google-cloud-clients/google-cloud-iot/pom.xml
+++ b/google-cloud-clients/google-cloud-iot/pom.xml
@@ -42,12 +42,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -58,6 +54,7 @@
       <artifactId>grpc-google-cloud-iot-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-kms/pom.xml b/google-cloud-clients/google-cloud-kms/pom.xml
index 9830da414724..a0192b91c55a 100644
--- a/google-cloud-clients/google-cloud-kms/pom.xml
+++ b/google-cloud-clients/google-cloud-kms/pom.xml
@@ -42,12 +42,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -73,6 +69,7 @@
       <artifactId>grpc-google-iam-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-language/pom.xml b/google-cloud-clients/google-cloud-language/pom.xml
index 95e7d008c6f9..0e0771a22776 100644
--- a/google-cloud-clients/google-cloud-language/pom.xml
+++ b/google-cloud-clients/google-cloud-language/pom.xml
@@ -49,12 +49,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -80,6 +76,7 @@
       <artifactId>grpc-google-cloud-language-v1beta2</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-logging/pom.xml b/google-cloud-clients/google-cloud-logging/pom.xml
index 10778bdd8540..d5a2a1cf7427 100644
--- a/google-cloud-clients/google-cloud-logging/pom.xml
+++ b/google-cloud-clients/google-cloud-logging/pom.xml
@@ -46,6 +46,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -82,6 +84,7 @@
       <artifactId>objenesis</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-monitoring/pom.xml b/google-cloud-clients/google-cloud-monitoring/pom.xml
index eb9223dac152..ab9f2188200b 100644
--- a/google-cloud-clients/google-cloud-monitoring/pom.xml
+++ b/google-cloud-clients/google-cloud-monitoring/pom.xml
@@ -42,12 +42,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/google-cloud-clients/google-cloud-notification/pom.xml b/google-cloud-clients/google-cloud-notification/pom.xml
index 5d7a754e36cc..5198a86616da 100644
--- a/google-cloud-clients/google-cloud-notification/pom.xml
+++ b/google-cloud-clients/google-cloud-notification/pom.xml
@@ -66,12 +66,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/google-cloud-clients/google-cloud-os-login/pom.xml b/google-cloud-clients/google-cloud-os-login/pom.xml
index 7797f94e53e9..f94f68cba300 100644
--- a/google-cloud-clients/google-cloud-os-login/pom.xml
+++ b/google-cloud-clients/google-cloud-os-login/pom.xml
@@ -46,12 +46,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -77,6 +73,7 @@
       <artifactId>grpc-google-iam-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-pubsub/pom.xml b/google-cloud-clients/google-cloud-pubsub/pom.xml
index 1d40e8490c0e..14b86e17e26f 100644
--- a/google-cloud-clients/google-cloud-pubsub/pom.xml
+++ b/google-cloud-clients/google-cloud-pubsub/pom.xml
@@ -51,12 +51,8 @@
       <artifactId>auto-value</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -82,6 +78,7 @@
       <artifactId>grpc-google-iam-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-redis/pom.xml b/google-cloud-clients/google-cloud-redis/pom.xml
index 579e7b733c86..cc985a63ce17 100644
--- a/google-cloud-clients/google-cloud-redis/pom.xml
+++ b/google-cloud-clients/google-cloud-redis/pom.xml
@@ -59,12 +59,8 @@
       <artifactId>auto-value</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -90,6 +86,7 @@
       <artifactId>grpc-google-iam-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-resourcemanager/pom.xml b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
index 14ff462d4a8d..1b5d17648d98 100644
--- a/google-cloud-clients/google-cloud-resourcemanager/pom.xml
+++ b/google-cloud-clients/google-cloud-resourcemanager/pom.xml
@@ -31,6 +31,8 @@
       <artifactId>google-api-services-cloudresourcemanager</artifactId>
       <scope>compile</scope>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
diff --git a/google-cloud-clients/google-cloud-scheduler/pom.xml b/google-cloud-clients/google-cloud-scheduler/pom.xml
index 06328db02f0c..c2f06f7d35b2 100644
--- a/google-cloud-clients/google-cloud-scheduler/pom.xml
+++ b/google-cloud-clients/google-cloud-scheduler/pom.xml
@@ -51,12 +51,8 @@
       <artifactId>auto-value</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -82,6 +78,7 @@
       <artifactId>grpc-google-iam-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-securitycenter/pom.xml b/google-cloud-clients/google-cloud-securitycenter/pom.xml
index c46c5b51d66e..e83303f4c032 100644
--- a/google-cloud-clients/google-cloud-securitycenter/pom.xml
+++ b/google-cloud-clients/google-cloud-securitycenter/pom.xml
@@ -46,12 +46,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -77,6 +73,7 @@
       <artifactId>grpc-google-iam-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-spanner/pom.xml b/google-cloud-clients/google-cloud-spanner/pom.xml
index 7fcdc13b82d4..7006877b6c0f 100644
--- a/google-cloud-clients/google-cloud-spanner/pom.xml
+++ b/google-cloud-clients/google-cloud-spanner/pom.xml
@@ -18,7 +18,6 @@
   </parent>
   <properties>
     <site.installationModule>google-cloud-spanner</site.installationModule>
-    <skipUnitTests>${skipTests}</skipUnitTests>
     <jacoco.skip>true</jacoco.skip>
   </properties>
   <build>
@@ -48,7 +47,6 @@
         <version>2.12.4</version>
         <configuration>
           <excludedGroups>com.google.cloud.spanner.IntegrationTest</excludedGroups>
-          <skipTests>${skipUnitTests}</skipTests>
           <reportNameSuffix>sponge_log</reportNameSuffix>
         </configuration>
       </plugin>
@@ -144,6 +142,8 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
@@ -171,6 +171,7 @@
       <artifactId>guava-testlib</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-speech/pom.xml b/google-cloud-clients/google-cloud-speech/pom.xml
index 02b2be184787..30e18ebc8741 100644
--- a/google-cloud-clients/google-cloud-speech/pom.xml
+++ b/google-cloud-clients/google-cloud-speech/pom.xml
@@ -50,12 +50,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/google-cloud-clients/google-cloud-storage/pom.xml b/google-cloud-clients/google-cloud-storage/pom.xml
index 8a52bdd6c7e3..36374b0811fc 100644
--- a/google-cloud-clients/google-cloud-storage/pom.xml
+++ b/google-cloud-clients/google-cloud-storage/pom.xml
@@ -31,6 +31,8 @@
       <artifactId>google-api-services-storage</artifactId>
       <scope>compile</scope>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>io.grpc</groupId>
       <artifactId>grpc-netty-shaded</artifactId>
diff --git a/google-cloud-clients/google-cloud-tasks/pom.xml b/google-cloud-clients/google-cloud-tasks/pom.xml
index e9984b52648b..e81673c9d335 100644
--- a/google-cloud-clients/google-cloud-tasks/pom.xml
+++ b/google-cloud-clients/google-cloud-tasks/pom.xml
@@ -46,12 +46,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -77,6 +73,7 @@
       <artifactId>grpc-google-cloud-tasks-v2beta3</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-texttospeech/pom.xml b/google-cloud-clients/google-cloud-texttospeech/pom.xml
index 9e6a4c61c464..66e9edd94d7c 100644
--- a/google-cloud-clients/google-cloud-texttospeech/pom.xml
+++ b/google-cloud-clients/google-cloud-texttospeech/pom.xml
@@ -46,12 +46,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -77,6 +73,7 @@
       <artifactId>grpc-google-cloud-texttospeech-v1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-trace/pom.xml b/google-cloud-clients/google-cloud-trace/pom.xml
index 11932aef536f..fcc2a74cfded 100644
--- a/google-cloud-clients/google-cloud-trace/pom.xml
+++ b/google-cloud-clients/google-cloud-trace/pom.xml
@@ -46,12 +46,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -77,6 +73,7 @@
       <artifactId>grpc-google-cloud-trace-v2</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-translate/pom.xml b/google-cloud-clients/google-cloud-translate/pom.xml
index 3c0f175568d9..6cd22d280227 100644
--- a/google-cloud-clients/google-cloud-translate/pom.xml
+++ b/google-cloud-clients/google-cloud-translate/pom.xml
@@ -31,6 +31,8 @@
       <artifactId>google-api-services-translate</artifactId>
       <scope>compile</scope>
     </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
diff --git a/google-cloud-clients/google-cloud-video-intelligence/pom.xml b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
index b3de9b1c512d..bfef00d0ed95 100644
--- a/google-cloud-clients/google-cloud-video-intelligence/pom.xml
+++ b/google-cloud-clients/google-cloud-video-intelligence/pom.xml
@@ -58,12 +58,9 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -104,6 +101,7 @@
       <artifactId>grpc-google-cloud-video-intelligence-v1p2beta1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-vision/pom.xml b/google-cloud-clients/google-cloud-vision/pom.xml
index 65a975fa119e..d3ebd72df3eb 100644
--- a/google-cloud-clients/google-cloud-vision/pom.xml
+++ b/google-cloud-clients/google-cloud-vision/pom.xml
@@ -54,12 +54,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -95,6 +91,7 @@
       <artifactId>grpc-google-cloud-vision-v1p3beta1</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
index 579cd43427d2..28922b5f8d17 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
+++ b/google-cloud-clients/google-cloud-websecurityscanner/pom.xml
@@ -42,12 +42,8 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-auth</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>google-cloud-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
+
+    <!-- Test dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -58,6 +54,7 @@
       <artifactId>grpc-google-cloud-websecurityscanner-v1alpha</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
diff --git a/google-cloud-clients/pom.xml b/google-cloud-clients/pom.xml
index 75c49208073f..4c1bde5337fb 100644
--- a/google-cloud-clients/pom.xml
+++ b/google-cloud-clients/pom.xml
@@ -351,11 +351,6 @@
         <artifactId>google-auth-library-oauth2-http</artifactId>
         <version>${google.auth.version}</version>
       </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-tcnative-boringssl-static</artifactId>
-        <version>${nettyssl.version}</version>
-      </dependency>
       <dependency>
         <groupId>io.opencensus</groupId>
         <artifactId>opencensus-api</artifactId>