diff --git a/.kokoro/build.bat b/.kokoro/build.bat
new file mode 100644
index 000000000..e5324a570
--- /dev/null
+++ b/.kokoro/build.bat
@@ -0,0 +1,3 @@
+:: See documentation in type-shell-output.bat
+
+"C:\Program Files\Git\bin\bash.exe" github/google-http-java-client/.kokoro/build.sh
diff --git a/.kokoro/continuous/java10.cfg b/.kokoro/continuous/java10.cfg
deleted file mode 100644
index 6e2f1f5fa..000000000
--- a/.kokoro/continuous/java10.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java10"
-}
diff --git a/.kokoro/continuous/java8-win.cfg b/.kokoro/continuous/java8-win.cfg
new file mode 100644
index 000000000..b44537d03
--- /dev/null
+++ b/.kokoro/continuous/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "google-http-java-client/.kokoro/build.bat"
diff --git a/.kokoro/presubmit/java10.cfg b/.kokoro/presubmit/java10.cfg
deleted file mode 100644
index 6e2f1f5fa..000000000
--- a/.kokoro/presubmit/java10.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java10"
-}
diff --git a/.kokoro/presubmit/java8-win.cfg b/.kokoro/presubmit/java8-win.cfg
new file mode 100644
index 000000000..b44537d03
--- /dev/null
+++ b/.kokoro/presubmit/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "google-http-java-client/.kokoro/build.bat"
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index d95ec318d..c25fd971a 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -9,7 +9,7 @@
   <suppress checks="." files="Base64.java"/>
   
   <!-- Don't check JavaDoc on tests in com.google.api.test.json. -->
-  <suppress checks="JavadocType" files="com/google/api/client/test/json/.*Test.java"/>
+  <suppress checks="JavadocType" files=".*Test.java"/>
 
   <!-- Don't check JavaDoc on package-info. -->
   <suppress checks="JavadocStyleCheck" files="package-info.java"/>
diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml
index 72d6dd4c5..6aedf5f25 100644
--- a/google-http-client/pom.xml
+++ b/google-http-client/pom.xml
@@ -102,6 +102,10 @@
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.j2objc</groupId>
       <artifactId>j2objc-annotations</artifactId>
diff --git a/pom.xml b/pom.xml
index 4b3506679..a0833e7fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -393,25 +393,6 @@
       </plugins>
     </pluginManagement>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M2</version><executions>
-        <execution>
-          <id>enforce-maven</id>
-          <goals>
-            <goal>enforce</goal>
-          </goals>
-          <configuration>
-            <rules>
-              <requireMavenVersion>
-                <version>[3.5.4,4.0.0)</version>
-              </requireMavenVersion>
-            </rules>
-          </configuration>
-        </execution>
-      </executions>
-      </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>