diff --git a/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java b/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java
index 30d35949d..c84596d1b 100644
--- a/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java
+++ b/samples/default-authorizationserver/src/test/java/sample/DefaultAuthorizationServerConsentTests.java
@@ -31,10 +31,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationConsentService;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.web.util.UriComponentsBuilder;
 
@@ -55,7 +56,7 @@ public class DefaultAuthorizationServerConsentTests {
 	@Autowired
 	private WebClient webClient;
 
-	@MockBean
+	@MockitoBean
 	private OAuth2AuthorizationConsentService authorizationConsentService;
 
 	private final String redirectUri = "http://127.0.0.1/login/oauth2/code/messaging-client-oidc";
diff --git a/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerConsentTests.java b/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerConsentTests.java
index c566e54fe..a89f19068 100644
--- a/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerConsentTests.java
+++ b/samples/demo-authorizationserver/src/test/java/sample/DemoAuthorizationServerConsentTests.java
@@ -31,7 +31,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationConsentService;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -55,7 +55,7 @@ public class DemoAuthorizationServerConsentTests {
 	@Autowired
 	private WebClient webClient;
 
-	@MockBean
+	@MockitoBean
 	private OAuth2AuthorizationConsentService authorizationConsentService;
 
 	private final String redirectUri = "http://127.0.0.1/login/oauth2/code/messaging-client-oidc";