diff --git a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidator.java b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidator.java
index b4afd6ba03..816409a54c 100644
--- a/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidator.java
+++ b/fdb-record-layer-core/src/main/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidator.java
@@ -251,10 +251,9 @@ private void validateMessage(@Nonnull Descriptor oldDescriptor, @Nonnull Descrip
         }
     }
 
-    @SuppressWarnings("deprecation") // checks the deprecated syntax field
     private void validateProtoSyntax(@Nonnull Descriptors.Descriptor oldDescriptor, @Nonnull Descriptors.Descriptor newDescriptor) {
-        if (!oldDescriptor.getFile().getSyntax().equals(newDescriptor.getFile().getSyntax())
-                || !oldDescriptor.getFile().getEdition().equals(newDescriptor.getFile().getEdition())) {
+        if (!oldDescriptor.getFile().toProto().getSyntax().equals(newDescriptor.getFile().toProto().getSyntax())
+                || !oldDescriptor.getFile().toProto().getEdition().equals(newDescriptor.getFile().toProto().getEdition())) {
             throw new MetaDataException("message descriptor proto syntax changed",
                     LogMessageKeys.RECORD_TYPE, oldDescriptor.getName());
         }
diff --git a/fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidatorTestV3.java b/fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidatorTestV3.java
index e5d9236926..afe34226e4 100644
--- a/fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidatorTestV3.java
+++ b/fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/metadata/MetaDataEvolutionValidatorTestV3.java
@@ -148,7 +148,7 @@ public void nestedProto2ToProto3() {
     @SuppressWarnings("deprecation") // test focuses on checking the (deprecated) syntax field
     @Test
     public void onlyFileProto2ToProto3() throws InvalidProtocolBufferException {
-        assertNotEquals(TestRecords1Proto.getDescriptor().getSyntax(), TestRecords1ImportedProto.getDescriptor().getSyntax());
+        assertNotEquals(TestRecords1Proto.getDescriptor().toProto().getSyntax(), TestRecords1ImportedProto.getDescriptor().toProto().getSyntax());
         MetaDataEvolutionValidator.getDefaultInstance().validateUnion(
                 TestRecords1Proto.RecordTypeUnion.getDescriptor(),
                 TestRecords1ImportedProto.RecordTypeUnion.getDescriptor()
diff --git a/fdb-relational-server/src/test/java/com/apple/foundationdb/relational/server/RelationalServerTest.java b/fdb-relational-server/src/test/java/com/apple/foundationdb/relational/server/RelationalServerTest.java
index 16cccc3a40..a135c9c766 100644
--- a/fdb-relational-server/src/test/java/com/apple/foundationdb/relational/server/RelationalServerTest.java
+++ b/fdb-relational-server/src/test/java/com/apple/foundationdb/relational/server/RelationalServerTest.java
@@ -110,7 +110,9 @@ static void simpleJDBCServiceClientOperation(ManagedChannel managedChannel) {
         } catch (Throwable t) {
             com.google.rpc.Status status = StatusProto.fromThrowable(t);
             if (status != null) {
-                logger.fatal(t + ", " + TextFormat.shortDebugString(status));
+                // V3: printer().shortDebugString(status)
+                // V4: printer().emittingSingleLine(true).printToString(status)
+                logger.fatal(t + ", " + TextFormat.printer().printToString(status).replace("\n", " "));
             }
             throw t;
         } finally {
diff --git a/yaml-tests/yaml-tests.gradle b/yaml-tests/yaml-tests.gradle
index 4486d88d8f..92c1601533 100644
--- a/yaml-tests/yaml-tests.gradle
+++ b/yaml-tests/yaml-tests.gradle
@@ -63,6 +63,7 @@ dependencies {
     implementation(libs.junit.api)
     implementation(libs.junit.params)
     implementation(libs.log4j.api)
+    implementation(libs.guava)
     implementation(libs.protobuf)
     implementation(libs.protobuf.util)
     implementation(libs.snakeyaml)