diff --git a/pom.xml b/pom.xml
index 286b332d..ade206c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 		<kotlin-coroutines.version>1.6.2</kotlin-coroutines.version>
 		<mockk.version>1.10.3-jdk8</mockk.version>
 		<mockito-core.version>3.8.0</mockito-core.version>
-		<spring.version>6.0.0-SNAPSHOT</spring.version>
+		<spring.version>6.0.0-M5</spring.version>
 		<spring-data-bom.version>2022.0.0-M4</spring-data-bom.version>
 		<spring-security-bom.version>5.4.5</spring-security-bom.version>
 		<reactor.version>2020.0.13</reactor.version>
diff --git a/spring-vault-core/src/main/java/org/springframework/vault/support/PemObject.java b/spring-vault-core/src/main/java/org/springframework/vault/support/PemObject.java
index 50346b63..3fe00f9d 100644
--- a/spring-vault-core/src/main/java/org/springframework/vault/support/PemObject.java
+++ b/spring-vault-core/src/main/java/org/springframework/vault/support/PemObject.java
@@ -276,12 +276,14 @@ public class PemObject {
 
 	enum PemObjectType {
 
-		CERTIFICATE_REQUEST("CERTIFICATE REQUEST"), NEW_CERTIFICATE_REQUEST("NEW CERTIFICATE REQUEST"),
-		CERTIFICATE("CERTIFICATE"), TRUSTED_CERTIFICATE("TRUSTED CERTIFICATE"), X509_CERTIFICATE("X509 CERTIFICATE"),
-		X509_CRL("X509 CRL"), PKCS7("PKCS7"), CMS("CMS"), ATTRIBUTE_CERTIFICATE("ATTRIBUTE CERTIFICATE"),
-		EC_PARAMETERS("EC PARAMETERS"), PUBLIC_KEY("PUBLIC KEY"), RSA_PUBLIC_KEY("RSA PUBLIC KEY"),
-		RSA_PRIVATE_KEY("RSA PRIVATE KEY"), EC_PRIVATE_KEY("EC PRIVATE KEY"),
-		ENCRYPTED_PRIVATE_KEY("ENCRYPTED PRIVATE KEY"), PRIVATE_KEY("PRIVATE KEY");
+		CERTIFICATE_REQUEST("CERTIFICATE REQUEST"), NEW_CERTIFICATE_REQUEST("NEW CERTIFICATE REQUEST"), CERTIFICATE(
+				"CERTIFICATE"), TRUSTED_CERTIFICATE("TRUSTED CERTIFICATE"), X509_CERTIFICATE(
+						"X509 CERTIFICATE"), X509_CRL("X509 CRL"), PKCS7("PKCS7"), CMS("CMS"), ATTRIBUTE_CERTIFICATE(
+								"ATTRIBUTE CERTIFICATE"), EC_PARAMETERS(
+										"EC PARAMETERS"), PUBLIC_KEY("PUBLIC KEY"), RSA_PUBLIC_KEY(
+												"RSA PUBLIC KEY"), RSA_PRIVATE_KEY("RSA PRIVATE KEY"), EC_PRIVATE_KEY(
+														"EC PRIVATE KEY"), ENCRYPTED_PRIVATE_KEY(
+																"ENCRYPTED PRIVATE KEY"), PRIVATE_KEY("PRIVATE KEY");
 
 		// cache
 		private static final PemObjectType[] constants = values();
diff --git a/spring-vault-core/src/test/java/org/springframework/vault/annotation/LeaseAwareVaultPropertySourceIntegrationTests.java b/spring-vault-core/src/test/java/org/springframework/vault/annotation/LeaseAwareVaultPropertySourceIntegrationTests.java
index c9984a77..ca389a26 100644
--- a/spring-vault-core/src/test/java/org/springframework/vault/annotation/LeaseAwareVaultPropertySourceIntegrationTests.java
+++ b/spring-vault-core/src/test/java/org/springframework/vault/annotation/LeaseAwareVaultPropertySourceIntegrationTests.java
@@ -89,7 +89,7 @@ class LeaseAwareVaultPropertySourceIntegrationTests {
 		}
 		catch (Exception e) {
 			assertThat(e).hasRootCauseInstanceOf(VaultPropertySourceNotFoundException.class)
-					.hasMessageContaining("Vault location [unknown] not resolvable");
+					.hasRootCauseMessage("Vault location [unknown] not resolvable");
 		}
 	}
 
@@ -103,7 +103,7 @@ class LeaseAwareVaultPropertySourceIntegrationTests {
 		}
 		catch (Exception e) {
 			assertThat(e).hasRootCauseInstanceOf(VaultPropertySourceNotFoundException.class)
-					.hasMessageContaining("Vault location [unknown] not resolvable");
+					.hasRootCauseMessage("Vault location [unknown] not resolvable");
 		}
 	}
 
diff --git a/spring-vault-core/src/test/java/org/springframework/vault/client/VaultResponsesUnitTests.java b/spring-vault-core/src/test/java/org/springframework/vault/client/VaultResponsesUnitTests.java
index 46607cb8..b4a15c8d 100644
--- a/spring-vault-core/src/test/java/org/springframework/vault/client/VaultResponsesUnitTests.java
+++ b/spring-vault-core/src/test/java/org/springframework/vault/client/VaultResponsesUnitTests.java
@@ -39,7 +39,7 @@ class VaultResponsesUnitTests {
 		HttpStatusCodeException cause = new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Bad Request");
 
 		VaultException vaultException = VaultResponses.buildException(cause);
-		assertThat(vaultException).hasMessageContaining("Status 400 Bad Request;").hasCause(cause);
+		assertThat(vaultException).hasMessageContaining("Status 400 Bad Request").hasCause(cause);
 	}
 
 	@Test
@@ -49,7 +49,7 @@ class VaultResponsesUnitTests {
 				"{\"errors\":[\"some-error\"]}".getBytes(), StandardCharsets.US_ASCII);
 
 		VaultException vaultException = VaultResponses.buildException(cause);
-		assertThat(vaultException).hasMessageContaining("Status 400 Bad Request: some-error;").hasCause(cause);
+		assertThat(vaultException).hasMessageContaining("Status 400 Bad Request: some-error").hasCause(cause);
 	}
 
 	@Test
@@ -58,7 +58,7 @@ class VaultResponsesUnitTests {
 		HttpStatusCodeException cause = new HttpClientErrorException(HttpStatus.BAD_REQUEST, "Bad Request");
 
 		VaultException vaultException = VaultResponses.buildException(cause, "sys/path");
-		assertThat(vaultException).hasMessageContaining("Status 400 Bad Request [sys/path];").hasCause(cause);
+		assertThat(vaultException).hasMessageContaining("Status 400 Bad Request [sys/path]").hasCause(cause);
 	}
 
 	@Test
@@ -68,7 +68,7 @@ class VaultResponsesUnitTests {
 				"{\"errors\":[\"some-error\"]}".getBytes(), StandardCharsets.US_ASCII);
 
 		VaultException vaultException = VaultResponses.buildException(cause, "sys/path");
-		assertThat(vaultException).hasMessageContaining("Status 400 Bad Request [sys/path]: some-error;")
+		assertThat(vaultException).hasMessageContaining("Status 400 Bad Request [sys/path]: some-error")
 				.hasCause(cause);
 	}