diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndCircularDependenciesWithAutowiredSettersIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndCircularDependenciesWithAutowiredSettersIntegrationTests.java
new file mode 100644
index 000000000000..ce67145b8589
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndCircularDependenciesWithAutowiredSettersIntegrationTests.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.bean.override.mockito.integration;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.aot.DisabledInAotMode;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.mockito.BDDMockito.then;
+
+/**
+ * Tests that {@link MockitoSpyBean @MockitoSpyBean} can be used to replace an
+ * existing bean with circular dependencies with {@link Autowired @Autowired}
+ * setter methods.
+ *
+ * @author Andy Wilkinson
+ * @author Sam Brannen
+ * @since 6.2
+ * @see MockitoSpyBeanAndCircularDependenciesWithLazyResolutionProxyIntegrationTests
+ */
+@SpringJUnitConfig
+@DisabledInAotMode // Circular dependencies cannot be resolved in AOT mode unless a @Lazy resolution proxy is used.
+class MockitoSpyBeanAndCircularDependenciesWithAutowiredSettersIntegrationTests {
+
+	@MockitoSpyBean
+	One one;
+
+	@Autowired
+	Two two;
+
+
+	@Test
+	void beanWithCircularDependenciesCanBeSpied() {
+		two.callOne();
+		then(one).should().doSomething();
+	}
+
+
+	@Configuration
+	@Import({ One.class, Two.class })
+	static class Config {
+	}
+
+	static class One {
+
+		@SuppressWarnings("unused")
+		private Two two;
+
+		@Autowired
+		void setTwo(Two two) {
+			this.two = two;
+		}
+
+		void doSomething() {
+		}
+	}
+
+	static class Two {
+
+		private One one;
+
+		@Autowired
+		void setOne(One one) {
+			this.one = one;
+		}
+
+		void callOne() {
+			this.one.doSomething();
+		}
+	}
+
+}
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndCircularDependenciesWithLazyResolutionProxyIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndCircularDependenciesWithLazyResolutionProxyIntegrationTests.java
new file mode 100644
index 000000000000..3a6cb5097095
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/integration/MockitoSpyBeanAndCircularDependenciesWithLazyResolutionProxyIntegrationTests.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.bean.override.mockito.integration;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.mockito.BDDMockito.then;
+
+/**
+ * Tests that {@link MockitoSpyBean @MockitoSpyBean} can be used to replace an
+ * existing bean with circular dependencies with {@link Autowired @Autowired}
+ * setter methods and a {@link Lazy @Lazy} resolution proxy.
+ *
+ * <p>In contrast to {@link MockitoSpyBeanAndCircularDependenciesWithAutowiredSettersIntegrationTests},
+ * this test class works in AOT mode.
+ *
+ * @author Sam Brannen
+ * @author Andy Wilkinson
+ * @since 6.2
+ * @see MockitoSpyBeanAndCircularDependenciesWithAutowiredSettersIntegrationTests
+ */
+@SpringJUnitConfig
+class MockitoSpyBeanAndCircularDependenciesWithLazyResolutionProxyIntegrationTests {
+
+	@MockitoSpyBean
+	One one;
+
+	@Autowired
+	Two two;
+
+
+	@Test
+	void beanWithCircularDependenciesCanBeSpied() {
+		two.callOne();
+		then(one).should().doSomething();
+	}
+
+
+	@Configuration
+	@Import({ One.class, Two.class })
+	static class Config {
+	}
+
+	static class One {
+
+		@SuppressWarnings("unused")
+		private Two two;
+
+		@Autowired
+		void setTwo(@Lazy Two two) {
+			this.two = two;
+		}
+
+		void doSomething() {
+		}
+	}
+
+	static class Two {
+
+		private One one;
+
+		@Autowired
+		void setOne(One one) {
+			this.one = one;
+		}
+
+		void callOne() {
+			this.one.doSomething();
+		}
+	}
+
+}