diff --git a/src/main/java/com/google/api/generator/gapic/composer/ClassNames.java b/src/main/java/com/google/api/generator/gapic/composer/ClassNames.java
index a53ffbb047..9135d88b5b 100644
--- a/src/main/java/com/google/api/generator/gapic/composer/ClassNames.java
+++ b/src/main/java/com/google/api/generator/gapic/composer/ClassNames.java
@@ -64,9 +64,7 @@ protected static String getGrpcServiceStubClassName(Service service) {
   }
 
   protected static String getServiceClientTestClassName(Service service) {
-    return String.format(
-        SERVICE_CLIENT_TEST_CLASS_NAME_PATTERN,
-        monolithBackwardsCompatibleName(service.overriddenName()));
+    return String.format(SERVICE_CLIENT_TEST_CLASS_NAME_PATTERN, service.overriddenName());
   }
 
   protected static String getMockServiceClassName(Service service) {
diff --git a/test/integration/BUILD.bazel b/test/integration/BUILD.bazel
index 7383a5ad11..f9cd2e84cc 100644
--- a/test/integration/BUILD.bazel
+++ b/test/integration/BUILD.bazel
@@ -200,7 +200,8 @@ java_gapic_library(
 java_gapic_test(
     name = "credentials_java_gapic_test_suite",
     test_classes = [
-        "com.google.cloud.iam.credentials.v1.IamCredentialsClientTest",
+        # Match google3.
+        "com.google.cloud.iam.credentials.v1.IAMCredentialsClientTest",
     ],
     runtime_deps = [":credentials_java_gapic_test"],
 )
diff --git a/test/integration/goldens/credentials/IamCredentialsClientTest.java b/test/integration/goldens/credentials/IAMCredentialsClientTest.java
similarity index 99%
rename from test/integration/goldens/credentials/IamCredentialsClientTest.java
rename to test/integration/goldens/credentials/IAMCredentialsClientTest.java
index e34da02196..461c655db0 100644
--- a/test/integration/goldens/credentials/IamCredentialsClientTest.java
+++ b/test/integration/goldens/credentials/IAMCredentialsClientTest.java
@@ -42,7 +42,7 @@
 import org.junit.Test;
 
 @Generated("by gapic-generator-java")
-public class IamCredentialsClientTest {
+public class IAMCredentialsClientTest {
   private static MockServiceHelper mockServiceHelper;
   private static MockIAMCredentials mockIAMCredentials;
   private IamCredentialsClient client;