diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java
index f374cb8e..2058a2bd 100644
--- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java
+++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/IntegrationTestSupport.java
@@ -16,7 +16,7 @@
 
 package org.springframework.cloud.vault.util;
 
-import org.junit.Rule;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 /**
  * Base class for integration tests using Vault.
@@ -25,7 +25,7 @@ import org.junit.Rule;
  */
 public abstract class IntegrationTestSupport {
 
-	@Rule
+	@RegisterExtension
 	public final VaultRule vaultRule = new VaultRule();
 
 	public final PrepareVault prepare() {
diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java
index b8845980..8bebb7fa 100644
--- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java
+++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/util/VaultRule.java
@@ -20,7 +20,8 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 
-import org.junit.rules.ExternalResource;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.util.Assert;
@@ -30,12 +31,7 @@ import org.springframework.vault.core.VaultTemplate;
 import org.springframework.vault.support.SslConfiguration;
 import org.springframework.vault.support.VaultToken;
 
-/**
- * Vault rule to ensure a running and prepared Vault.
- *
- * @author Mark Paluch
- */
-public class VaultRule extends ExternalResource {
+public class VaultRule implements BeforeEachCallback {
 
 	public static final Version VERSIONING_INTRODUCED_WITH = Version.parse("0.10.0");
 
@@ -76,6 +72,10 @@ public class VaultRule extends ExternalResource {
 	}
 
 	@Override
+	public void beforeEach(ExtensionContext context) {
+		before();
+	}
+
 	public void before() {
 
 		try (Socket socket = new Socket()) {
@@ -83,9 +83,9 @@ public class VaultRule extends ExternalResource {
 			socket.connect(new InetSocketAddress(InetAddress.getByName("localhost"), this.vaultEndpoint.getPort()));
 		}
 		catch (Exception ex) {
-			throw new IllegalStateException(
-					String.format("Vault is not running on localhost:%d which is required to run a test using @Rule %s",
-							this.vaultEndpoint.getPort(), getClass().getSimpleName()));
+			throw new IllegalStateException(String.format(
+					"Vault is not running on localhost:%d which is required to run a test using VaultExtension %s",
+					this.vaultEndpoint.getPort(), getClass().getSimpleName()));
 		}
 
 		if (!this.prepareVault.isAvailable()) {