diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs
index fa26ca7fedd..f050c834cca 100644
--- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs
+++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs
@@ -766,7 +766,7 @@ public void CreateDataKeyAndDoubleEncryptionTest(
         [InlineData("aws", null, null, null)]
         [InlineData("aws", "kms.us-east-1.amazonaws.com", null, null)]
         [InlineData("aws", "kms.us-east-1.amazonaws.com:443", null, null)]
-        [InlineData("aws", "kms.us-east-1.amazonaws.com:12345", "$ConnectionRefused$", null)]
+        [InlineData("kmip", "localhost:12345", "$ConnectionRefused$", null)]
         [InlineData("aws", "kms.us-east-2.amazonaws.com", "_GenericCryptException_", null)]
         [InlineData("aws", "doesnotexist.invalid", "$HostNotFound,TryAgain$", null)]
         // additional not spec tests
@@ -777,9 +777,9 @@ public void CreateDataKeyAndDoubleEncryptionTest(
         [InlineData("gcp", "cloudkms.googleapis.com:443", null, "$HostNotFound,TryAgain$")]
         [InlineData("gcp", "doesnotexist.invalid:443", "Invalid KMS response", null)]
         // kmip
-        [InlineData("kmip", null, null, "$HostNotFound$")]
+        [InlineData("kmip", null, null, "$HostNotFound,TryAgain$")]
         [InlineData("kmip", "localhost:5698", null, null)]
-        [InlineData("kmip", "doesnotexist.local:5698", "$HostNotFound,TryAgain$", null)]
+        [InlineData("kmip", "doesnotexist.invalid:5698", "$HostNotFound,TryAgain$", null)]
         public void CustomEndpointTest(
             string kmsType,
             string customEndpoint,
@@ -889,7 +889,7 @@ void InvalidKmsEndpointConfigurator(string kt, Dictionary<string, object> ko)
                         ko.Add("endpoint", "doesnotexist.invalid:443");
                         break;
                     case "kmip":
-                        AddOrReplace(ko, "endpoint", "doesnotexist.local:5698");
+                        AddOrReplace(ko, "endpoint", "doesnotexist.invalid:5698");
                         break;
                 }
             }
@@ -1600,7 +1600,7 @@ public void KmsTlsOptionsTest(
                         },
                         "azure" or "azure:name1" => new BsonDocument
                         {
-                            { "keyVaultEndpoint", "doesnotexist.local" },
+                            { "keyVaultEndpoint", "doesnotexist.invalid" },
                             { "keyName", "foo" }
                         },
                         "gcp" or "gcp:name1" => new BsonDocument