diff --git a/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java b/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java
index 728562d6..b54158e7 100644
--- a/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/gradle/SpringJavaPlugin.java
@@ -29,7 +29,6 @@ import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.plugins.PluginManager;
 import org.gradle.api.tasks.compile.CompileOptions;
 import org.gradle.api.tasks.compile.JavaCompile;
-import org.gradle.api.tasks.testing.Test;
 import org.gradle.jvm.tasks.Jar;
 import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper;
 
@@ -91,6 +90,5 @@ public class SpringJavaPlugin implements Plugin<Project> {
 			attributes.put("Automatic-Module-Name", project.getName().replace("-", "."));
 			manifest.attributes(attributes);
 		}));
-		project.getTasks().withType(Test.class, Test::useJUnitPlatform);
 	}
 }
diff --git a/dependencies/spring-authorization-server-dependencies.gradle b/dependencies/spring-authorization-server-dependencies.gradle
index fdea6041..74f19fdc 100644
--- a/dependencies/spring-authorization-server-dependencies.gradle
+++ b/dependencies/spring-authorization-server-dependencies.gradle
@@ -9,7 +9,6 @@ javaPlatform {
 dependencies {
 	api platform("org.springframework:spring-framework-bom:$springFrameworkVersion")
 	api platform("org.springframework.security:spring-security-bom:$springSecurityVersion")
-	api platform("org.junit:junit-bom:5.8.2")
 	api platform("com.fasterxml.jackson:jackson-bom:2.13.2")
 	constraints {
 		api "com.nimbusds:nimbus-jose-jwt:9.10.1"
diff --git a/oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle b/oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle
index 4db6d872..3e1f0111 100644
--- a/oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle
+++ b/oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle
@@ -21,9 +21,7 @@ dependencies {
 
 	testImplementation "org.springframework.security:spring-security-test"
 	testImplementation "org.springframework:spring-webmvc"
-	testImplementation "org.junit.jupiter:junit-jupiter"
 	testImplementation "junit:junit"
-	testImplementation "org.junit.vintage:junit-vintage-engine"
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.mockito:mockito-core"
 	testImplementation "com.jayway.jsonpath:json-path"
diff --git a/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle b/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle
index 21340bc3..0e20e3dc 100644
--- a/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle
+++ b/samples/custom-consent-authorizationserver/samples-custom-consent-authorizationserver.gradle
@@ -19,13 +19,7 @@ dependencies {
 	implementation project(":spring-security-oauth2-authorization-server")
 
 	testImplementation "org.springframework.boot:spring-boot-starter-test"
-	testImplementation "org.junit.jupiter:junit-jupiter"
-	testImplementation "junit:junit"
-	testImplementation "org.junit.vintage:junit-vintage-engine"
 	testImplementation "org.springframework.security:spring-security-test"
+	testImplementation "junit:junit"
 	testImplementation "net.sourceforge.htmlunit:htmlunit"
 }
-
-tasks.named("test") {
-	useJUnitPlatform()
-}
diff --git a/samples/default-authorizationserver/samples-default-authorizationserver.gradle b/samples/default-authorizationserver/samples-default-authorizationserver.gradle
index cdc87738..0f065405 100644
--- a/samples/default-authorizationserver/samples-default-authorizationserver.gradle
+++ b/samples/default-authorizationserver/samples-default-authorizationserver.gradle
@@ -20,13 +20,7 @@ dependencies {
 	runtimeOnly "com.h2database:h2"
 
 	testImplementation "org.springframework.boot:spring-boot-starter-test"
-	testImplementation "org.junit.jupiter:junit-jupiter"
-	testImplementation "junit:junit"
-	testImplementation "org.junit.vintage:junit-vintage-engine"
 	testImplementation "org.springframework.security:spring-security-test"
+	testImplementation "junit:junit"
 	testImplementation "net.sourceforge.htmlunit:htmlunit"
 }
-
-tasks.named("test") {
-	useJUnitPlatform()
-}
diff --git a/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle b/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle
index 2df8ee82..c92237f7 100644
--- a/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle
+++ b/samples/federated-identity-authorizationserver/samples-federated-identity-authorizationserver.gradle
@@ -24,7 +24,3 @@ dependencies {
 	implementation project(":spring-security-oauth2-authorization-server")
 	runtimeOnly "com.h2database:h2"
 }
-
-tasks.named("test") {
-	useJUnitPlatform()
-}
diff --git a/samples/messages-client/samples-messages-client.gradle b/samples/messages-client/samples-messages-client.gradle
index ac3351a4..d36318be 100644
--- a/samples/messages-client/samples-messages-client.gradle
+++ b/samples/messages-client/samples-messages-client.gradle
@@ -24,7 +24,3 @@ dependencies {
 	implementation "org.webjars:bootstrap:3.4.1"
 	implementation "org.webjars:jquery:3.4.1"
 }
-
-tasks.named("test") {
-	useJUnitPlatform()
-}
diff --git a/samples/messages-resource/samples-messages-resource.gradle b/samples/messages-resource/samples-messages-resource.gradle
index 31572a0b..e6c0e2d7 100644
--- a/samples/messages-resource/samples-messages-resource.gradle
+++ b/samples/messages-resource/samples-messages-resource.gradle
@@ -17,7 +17,3 @@ dependencies {
 	implementation "org.springframework.boot:spring-boot-starter-security"
 	implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
 }
-
-tasks.named("test") {
-	useJUnitPlatform()
-}