diff --git a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java
index 958c60b04f..ae0c4513db 100644
--- a/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java
+++ b/spring-cloud-gcp-data-spanner/src/test/java/com/google/cloud/spring/data/spanner/core/convert/SpannerWriteMethodCoverageTests.java
@@ -24,6 +24,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
+import java.util.Arrays;
 import org.junit.jupiter.api.Test;
 
 /** Tests to check for new mapping methods that appear in the Spanner client lib. */
@@ -33,6 +34,14 @@ class SpannerWriteMethodCoverageTests {
   @Test
   void allKnownMappingTypesTest() throws NoSuchFieldException {
     for (Method method : ValueBinder.class.getMethods()) {
+      // TODO: https://github.com/GoogleCloudPlatform/spring-cloud-gcp/issues/2574
+      // Until this is implemented, ignore the new column types by ignoring the methods
+      // that have the new column types as a parameter
+      if (Arrays.stream(method.getParameterTypes()).map(Class::getName)
+              .anyMatch(x -> x.contains("ProtocolMessageEnum")
+                      || x.contains("AbstractMessage"))) {
+        continue;
+      }
 
       String methodName = method.getName();
 
diff --git a/spring-cloud-gcp-dependencies/pom.xml b/spring-cloud-gcp-dependencies/pom.xml
index 26d1bb912f..89518b01ac 100644
--- a/spring-cloud-gcp-dependencies/pom.xml
+++ b/spring-cloud-gcp-dependencies/pom.xml
@@ -34,7 +34,7 @@
 	</distributionManagement>
 
 	<properties>
-		<gcp-libraries-bom.version>26.30.0</gcp-libraries-bom.version>
+		<gcp-libraries-bom.version>26.31.0</gcp-libraries-bom.version>
 		<cloud-sql-socket-factory.version>1.14.1</cloud-sql-socket-factory.version>
 		<r2dbc-postgres-driver.version>1.0.4.RELEASE</r2dbc-postgres-driver.version>
 		<cloud-spanner-r2dbc.version>1.3.0</cloud-spanner-r2dbc.version>
diff --git a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java
index bdbab069fa..1fc4e7df42 100644
--- a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java
+++ b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultPublisherFactoryTests.java
@@ -50,6 +50,7 @@ public void setUp() throws IOException {
     ApiCallContext mockContext = mock(ApiCallContext.class);
     when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockContext);
     when(mockContext.withTransportChannel(any())).thenReturn(mockContext);
+    when(mockContext.withEndpointContext(any())).thenReturn(mockContext);
     factory.setChannelProvider(mockChannelProvider);
   }
 
diff --git a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java
index 4c339c8182..786c25791d 100644
--- a/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java
+++ b/spring-cloud-gcp-pubsub/src/test/java/com/google/cloud/spring/pubsub/support/DefaultSubscriberFactoryTests.java
@@ -769,6 +769,7 @@ void createSubscriberStubSucceeds() {
     when(this.mockTransportChannel.getEmptyCallContext()).thenReturn(this.mockApiCallContext);
     when(this.mockApiCallContext.withCredentials(any())).thenReturn(this.mockApiCallContext);
     when(this.mockApiCallContext.withTransportChannel(any())).thenReturn(this.mockApiCallContext);
+    when(this.mockApiCallContext.withEndpointContext(any())).thenReturn(this.mockApiCallContext);
 
     GcpProjectIdProvider projectIdProvider = () -> "project";
     DefaultSubscriberFactory factory =
diff --git a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java
index 517ead400e..2c6d3a6ab2 100644
--- a/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java
+++ b/spring-cloud-previews/google-cloud-language-spring-starter/src/test/java/com/google/cloud/language/v2/spring/LanguageAutoConfigurationTests.java
@@ -195,6 +195,7 @@ void testCustomTransportChannelProviderUsedWhenProvided() throws IOException {
     when(mockTransportChannel.getEmptyCallContext()).thenReturn(mockApiCallContext);
     when(mockApiCallContext.withCredentials(any())).thenReturn(mockApiCallContext);
     when(mockApiCallContext.withTransportChannel(any())).thenReturn(mockApiCallContext);
+    when(mockApiCallContext.withEndpointContext(any())).thenReturn(mockApiCallContext);
 
     contextRunner
         .withBean(