diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle
index ffb1186721..5c634a1abb 100644
--- a/config/spring-security-config.gradle
+++ b/config/spring-security-config.gradle
@@ -156,6 +156,10 @@ task saml2Tests(type: Test) {
 	dependsOn compileSaml2TestJava
 }
 
-tasks.named('test') {
-	finalizedBy 'saml2Tests'
+test {
+	shouldRunAfter saml2Tests
+}
+
+tasks.named('check') {
+	dependsOn saml2Tests
 }