diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientWithRestTemplateBuilderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestClientWithRestTemplateBuilderTests.java
similarity index 95%
rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientWithRestTemplateBuilderTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestClientWithRestTemplateBuilderTests.java
index cceb838bf7e..38d6899c296 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientWithRestTemplateBuilderTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestClientWithRestTemplateBuilderTests.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.test.autoconfigure.web.client;
+package org.springframework.boot.web.client;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestClient.Builder;
diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientWithRestTemplateTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestClientWithRestTemplateTests.java
similarity index 98%
rename from spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientWithRestTemplateTests.java
rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestClientWithRestTemplateTests.java
index 6406e8e9b15..12972b6b620 100644
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientWithRestTemplateTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestClientWithRestTemplateTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.test.autoconfigure.web.client;
+package org.springframework.boot.web.client;
 
 import org.junit.jupiter.api.Test;