diff --git a/gae-interop-testing/gae-jdk8/build.gradle b/gae-interop-testing/gae-jdk8/build.gradle
index 81aeda54a4..f3ff765ddf 100644
--- a/gae-interop-testing/gae-jdk8/build.gradle
+++ b/gae-interop-testing/gae-jdk8/build.gradle
@@ -166,7 +166,3 @@ tasks.register("runInteropTestRemote") {
         throw new GradleException("Interop test failed:\nthrowable:${caught}")
     }
 }
-
-tasks.named("javadoc").configure {
-    enabled = false
-}
diff --git a/interop-testing/build.gradle b/interop-testing/build.gradle
index 64e7e8ee33..9967fdfc10 100644
--- a/interop-testing/build.gradle
+++ b/interop-testing/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "application"
-    id "java"
+    id "java-library"
     id "maven-publish"
 
     id "com.google.protobuf"
@@ -21,17 +21,19 @@ dependencies {
             project(':grpc-googleapis'),
             project(':grpc-netty'),
             project(':grpc-okhttp'),
-            project(':grpc-protobuf'),
             project(':grpc-rls'),
             project(':grpc-services'),
-            project(':grpc-stub'),
             project(':grpc-testing'),
             project(path: ':grpc-xds', configuration: 'shadow'),
             libraries.hdrhistogram,
-            libraries.junit,
             libraries.truth,
             libraries.opencensus.contrib.grpc.metrics,
-            libraries.google.auth.oauth2Http
+            libraries.google.auth.oauth2Http,
+            libraries.guava.jre // Fix checkUpperBoundDeps using -android
+    api project(':grpc-api'),
+            project(':grpc-stub'),
+            project(':grpc-protobuf'),
+            libraries.junit
     compileOnly libraries.javax.annotation
     // TODO(sergiitk): replace with com.google.cloud:google-cloud-logging
     // Used instead of google-cloud-logging because it's failing
diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java b/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java
index 48001cbdc1..e12e4ffa55 100644
--- a/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java
+++ b/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java
@@ -2130,7 +2130,7 @@ public abstract class AbstractInteropTest {
     assertTrue(tooManyFailuresErrorMessage, totalFailures <= maxFailures);
   }
 
-  protected static void assertSuccess(StreamRecorder<?> recorder) {
+  private static void assertSuccess(StreamRecorder<?> recorder) {
     if (recorder.getError() != null) {
       throw new AssertionError(recorder.getError());
     }