diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts
index 8d1979601c64..0d515414894f 100644
--- a/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts
+++ b/gradle/plugins/common/src/main/kotlin/junitbuild.java-nullability-conventions.gradle.kts
@@ -37,12 +37,11 @@ tasks.withType<JavaCompile>().configureEach {
 				"StringSplitter", // We don`t want to use Guava.
 				"UnnecessaryLambda", // The findings of this check are subjective because a named constant can be more readable in many cases.
 				// picnic (https://error-prone.picnic.tech)
-				"ConstantNaming",
-				"DirectReturn", // https://github.com/junit-team/junit-framework/pull/5006#discussion_r2403984446
+				// "ConstantNaming",
+				"DirectReturn", // We don`t want to use this: https://github.com/junit-team/junit-framework/pull/5006#discussion_r2403984446
 				"FormatStringConcatenation",
 				"IdentityConversion",
-				"LexicographicalAnnotationAttributeListing",
-				"LexicographicalAnnotationListing",
+				"LexicographicalAnnotationAttributeListing", // We don`t want to use this: https://github.com/junit-team/junit-framework/pull/5043#pullrequestreview-3330615838
 				"MissingTestCall",
 				"NestedOptionals",
 				"NonStaticImport",
@@ -55,6 +54,13 @@ tasks.withType<JavaCompile>().configureEach {
 				"PackageLocation",
 				"RedundantStringConversion",
 				"RedundantStringEscape",
+				//"LexicographicalAnnotationListing",
+				//"ConstantNaming",
+			)
+			errorproneArgs.addAll(
+				"-XepPatchLocation:IN_PLACE",
+				"-XepPatchChecks:LexicographicalAnnotationListing"
+				// "-XepPatchChecks:ConstantNaming" why not working?
 			)
 		} else {
 			disableAllChecks = true