diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/PrepareVault.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/PrepareVault.java
index 391f3468..487dffbb 100644
--- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/PrepareVault.java
+++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/PrepareVault.java
@@ -15,7 +15,6 @@
  */
 package org.springframework.cloud.vault.util;
 
-import java.util.Collections;
 import java.util.Map;
 
 import org.springframework.util.Assert;
@@ -28,6 +27,7 @@ import org.springframework.vault.support.VaultInitializationResponse;
 import org.springframework.vault.support.VaultMount;
 import org.springframework.vault.support.VaultToken;
 import org.springframework.vault.support.VaultTokenRequest;
+import org.springframework.vault.support.VaultTokenRequest.VaultTokenRequestBuilder;
 import org.springframework.vault.support.VaultTokenResponse;
 import org.springframework.vault.support.VaultUnsealStatus;
 
@@ -80,15 +80,15 @@ public class PrepareVault {
 	 */
 	public VaultToken createToken(String tokenId, String policy) {
 
-		VaultTokenRequest tokenRequest = new VaultTokenRequest();
 
-		tokenRequest.setId(tokenId);
-		if (policy != null) {
-			tokenRequest.setPolicies(Collections.singletonList(policy));
+		VaultTokenRequestBuilder builder = VaultTokenRequest.builder().id(tokenId);
+
+		if (StringUtils.hasText(policy)) {
+			builder.withPolicy(policy);
 		}
 
 		VaultTokenResponse vaultTokenResponse = vaultOperations.opsForToken()
-				.create(tokenRequest);
+				.create(builder.build());
 		return vaultTokenResponse.getToken();
 	}