diff --git a/build.gradle b/build.gradle
index 795e0fcbdb..481bf9ea42 100644
--- a/build.gradle
+++ b/build.gradle
@@ -691,6 +691,9 @@ project("spring-test") {
 
 	task testNG(type: Test) {
 		useTestNG()
+		scanForTestClasses = false
+		include "**/testng/*.*"
+		exclude "**/FailingBeforeAndAfterMethodsTests.class"
 		// "TestCase" classes are run by other test classes, not the build.
 		exclude "**/*TestCase.class"
 		// Generate TestNG reports alongside JUnit reports.
@@ -700,9 +703,11 @@ project("spring-test") {
 	test {
 		dependsOn testNG
 		useJUnit()
+		exclude "**/testng/*.*"
 		// "TestCase" classes are run by other test classes, not the build.
 		exclude(["**/*TestCase.class", "**/*TestSuite.class"])
 	}
+
 }
 
 project("spring-test-mvc") {