diff --git a/etc/checkstyle/checkstyle-suppressions.xml b/etc/checkstyle/checkstyle-suppressions.xml
index 07b0071dd4..2c72af8d5a 100644
--- a/etc/checkstyle/checkstyle-suppressions.xml
+++ b/etc/checkstyle/checkstyle-suppressions.xml
@@ -3,7 +3,6 @@
 		"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
 		"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-	<suppress files=".*" checks="InterfaceIsType" />
 	<suppress files=".*" checks="JavadocMethod" />
 	<suppress files=".*" checks="JavadocStyle" />
 	<suppress files=".*" checks="JavadocTagContinuationIndentation" />
@@ -38,4 +37,18 @@
 	<!-- Ignore third-party code -->
 	<suppress files="BCrypt\.java|BCryptTests\.java" checks=".*"/>
 	<suppress files="org[\\/]springframework[\\/]security[\\/]core[\\/]ComparableVersion\.java" checks=".*"/>
+
+	<!-- InterfaceIsType rules we can't fix until a major revision due to back compatibility -->
+	<suppress files="JwsAlgorithms\.java" checks="InterfaceIsType"/>
+	<suppress files="JwtClaimNames\.java" checks="InterfaceIsType"/>
+	<suppress files="OAuth2ErrorCodes\.java" checks="InterfaceIsType"/>
+	<suppress files="OAuth2ParameterNames\.java" checks="InterfaceIsType"/>
+	<suppress files="PkceParameterNames\.java" checks="InterfaceIsType"/>
+	<suppress files="IdTokenClaimNames\.java" checks="InterfaceIsType"/>
+	<suppress files="OidcScopes\.java" checks="InterfaceIsType"/>
+	<suppress files="StandardClaimNames\.java" checks="InterfaceIsType"/>
+	<suppress files="OidcParameterNames\.java" checks="InterfaceIsType"/>
+	<suppress files="BearerTokenErrorCodes\.java" checks="InterfaceIsType"/>
+	<suppress files="OAuth2IntrospectionClaimNames\.java" checks="InterfaceIsType"/>
+	<suppress files="Saml2ErrorCodes\.java" checks="InterfaceIsType"/>
 </suppressions>