diff --git a/samples/webflux-security/src/main/resources/graphql/employeesNames.graphql b/samples/webflux-security/src/test/resources/graphql-test/employeesNames.graphql
similarity index 100%
rename from samples/webflux-security/src/main/resources/graphql/employeesNames.graphql
rename to samples/webflux-security/src/test/resources/graphql-test/employeesNames.graphql
diff --git a/samples/webflux-security/src/main/resources/graphql/employeesNamesAndSalaries.graphql b/samples/webflux-security/src/test/resources/graphql-test/employeesNamesAndSalaries.graphql
similarity index 100%
rename from samples/webflux-security/src/main/resources/graphql/employeesNamesAndSalaries.graphql
rename to samples/webflux-security/src/test/resources/graphql-test/employeesNamesAndSalaries.graphql
diff --git a/samples/webmvc-http-security/src/main/java/io/spring/sample/graphql/SampleApplication.java b/samples/webmvc-http-security/src/main/java/io/spring/sample/graphql/SampleApplication.java
index db857a4e..68e56f91 100644
--- a/samples/webmvc-http-security/src/main/java/io/spring/sample/graphql/SampleApplication.java
+++ b/samples/webmvc-http-security/src/main/java/io/spring/sample/graphql/SampleApplication.java
@@ -23,7 +23,7 @@ import reactor.core.publisher.Mono;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.graphql.web.WebGraphQlHandlerInterceptor;
+import org.springframework.graphql.server.WebGraphQlInterceptor;
 
 @SpringBootApplication
 public class SampleApplication {
@@ -33,7 +33,7 @@ public class SampleApplication {
 	}
 
 	@Bean
-	public WebGraphQlHandlerInterceptor interceptor() {
+	public WebGraphQlInterceptor interceptor() {
 		return (webInput, interceptorChain) -> {
 			// Switch threads to prove ThreadLocal context propagation works
 			return Mono.delay(Duration.ofMillis(10)).flatMap(aLong -> interceptorChain.next(webInput));
diff --git a/samples/webmvc-http-security/src/main/resources/graphql/employeesNames.graphql b/samples/webmvc-http-security/src/test/resources/graphql-test/employeesNames.graphql
similarity index 100%
rename from samples/webmvc-http-security/src/main/resources/graphql/employeesNames.graphql
rename to samples/webmvc-http-security/src/test/resources/graphql-test/employeesNames.graphql
diff --git a/samples/webmvc-http-security/src/main/resources/graphql/employeesNamesAndSalaries.graphql b/samples/webmvc-http-security/src/test/resources/graphql-test/employeesNamesAndSalaries.graphql
similarity index 100%
rename from samples/webmvc-http-security/src/main/resources/graphql/employeesNamesAndSalaries.graphql
rename to samples/webmvc-http-security/src/test/resources/graphql-test/employeesNamesAndSalaries.graphql
diff --git a/samples/webmvc-http/src/main/resources/graphql/artifactRepositories.graphql b/samples/webmvc-http/src/test/resources/graphql-test/artifactRepositories.graphql
similarity index 100%
rename from samples/webmvc-http/src/main/resources/graphql/artifactRepositories.graphql
rename to samples/webmvc-http/src/test/resources/graphql-test/artifactRepositories.graphql
diff --git a/samples/webmvc-http/src/main/resources/graphql/artifactRepository.graphql b/samples/webmvc-http/src/test/resources/graphql-test/artifactRepository.graphql
similarity index 100%
rename from samples/webmvc-http/src/main/resources/graphql/artifactRepository.graphql
rename to samples/webmvc-http/src/test/resources/graphql-test/artifactRepository.graphql
diff --git a/samples/webmvc-http/src/main/resources/graphql/projectReleases.graphql b/samples/webmvc-http/src/test/resources/graphql-test/projectReleases.graphql
similarity index 100%
rename from samples/webmvc-http/src/main/resources/graphql/projectReleases.graphql
rename to samples/webmvc-http/src/test/resources/graphql-test/projectReleases.graphql
diff --git a/samples/webmvc-http/src/main/resources/graphql/projectRepositoryUrl.graphql b/samples/webmvc-http/src/test/resources/graphql-test/projectRepositoryUrl.graphql
similarity index 100%
rename from samples/webmvc-http/src/main/resources/graphql/projectRepositoryUrl.graphql
rename to samples/webmvc-http/src/test/resources/graphql-test/projectRepositoryUrl.graphql