diff --git a/x-pack/plugin/identity-provider/build.gradle b/x-pack/plugin/identity-provider/build.gradle
index 7b0af04e0a121..5fa5b9eafa4a8 100644
--- a/x-pack/plugin/identity-provider/build.gradle
+++ b/x-pack/plugin/identity-provider/build.gradle
@@ -51,10 +51,6 @@ dependencies {
   testImplementation "org.elasticsearch:mocksocket:${versions.mocksocket}"
 }
 
-tasks.withType(JavaCompile).configureEach {
-  options.compilerArgs << "-Xlint:-unchecked"
-}
-
 tasks.named("dependencyLicenses").configure {
   mapping from: /java-support|opensaml-.*/, to: 'shibboleth'
   mapping from: /http.*/, to: 'httpclient'
diff --git a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/WildcardServiceProvider.java b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/WildcardServiceProvider.java
index 7bca5399fd648..497e2ca2a95bc 100644
--- a/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/WildcardServiceProvider.java
+++ b/x-pack/plugin/identity-provider/src/main/java/org/elasticsearch/xpack/idp/saml/sp/WildcardServiceProvider.java
@@ -39,6 +39,7 @@
  */
 class WildcardServiceProvider {
 
+    @SuppressWarnings("unchecked")
     private static final ConstructingObjectParser<WildcardServiceProvider, Void> PARSER = new ConstructingObjectParser<>(
         "wildcard_service",
         args -> {
diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnActionTests.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnActionTests.java
index 84294f80be75c..2ee3683c0372a 100644
--- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnActionTests.java
+++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/action/TransportSamlInitiateSingleSignOnActionTests.java
@@ -117,6 +117,7 @@ public void testGetResponseWithoutSecondaryAuthenticationInSpInitiatedFlow() thr
         assertThat(response.getSamlResponse(), containsString("InResponseTo=\"" + requestId + "\""));
     }
 
+    @SuppressWarnings("unchecked")
     private TransportSamlInitiateSingleSignOnAction setupTransportAction(boolean withSecondaryAuth) throws Exception {
         final Settings settings = Settings.builder()
             .put("path.home", createTempDir())
diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolverTests.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolverTests.java
index 36a767c9ea377..2a9f71ac7abef 100644
--- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolverTests.java
+++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/privileges/UserPrivilegeResolverTests.java
@@ -49,6 +49,7 @@ public class UserPrivilegeResolverTests extends ESTestCase {
     private UserPrivilegeResolver resolver;
 
     @Before
+    @SuppressWarnings("unchecked")
     public void setupTest() {
         client = mock(Client.class);
         securityContext = new SecurityContext(Settings.EMPTY, new ThreadContext(Settings.EMPTY));
@@ -158,6 +159,8 @@ private ServiceProviderPrivileges service(String appName, String resource, Funct
         return new ServiceProviderPrivileges(appName, resource, roleMapping);
     }
 
+    @SafeVarargs
+    @SuppressWarnings("unchecked")
     private HasPrivilegesResponse setupHasPrivileges(String username, String appName,
                                                      Tuple<String, Tuple<String, Boolean>>... resourceActionAccess) {
         final boolean isCompleteMatch = randomBoolean();
diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderResolverTests.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderResolverTests.java
index 8641af3e24846..e96b260a7e85f 100644
--- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderResolverTests.java
+++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/sp/SamlServiceProviderResolverTests.java
@@ -155,6 +155,7 @@ private ServiceProviderDefaults configureIdentityProviderDefaults() {
         return defaults;
     }
 
+    @SuppressWarnings("unchecked")
     private void mockDocument(String entityId, DocumentVersion docVersion, SamlServiceProviderDocument document) {
         doAnswer(inv -> {
             final Object[] args = inv.getArguments();
diff --git a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java
index cf48b338d2620..157c7ce22620c 100644
--- a/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java
+++ b/x-pack/plugin/identity-provider/src/test/java/org/elasticsearch/xpack/idp/saml/test/IdpSamlTestCase.java
@@ -34,11 +34,6 @@
 import org.opensaml.security.x509.X509Credential;
 import org.w3c.dom.Element;
 
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -55,6 +50,11 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 import static org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport.getUnmarshallerFactory;
 
@@ -87,6 +87,7 @@ public static void restoreLocale() {
         }
     }
 
+    @SuppressWarnings("unchecked")
     protected static void mockRegisteredServiceProvider(SamlIdentityProvider idp, String entityId, SamlServiceProvider sp) {
         Mockito.doAnswer(inv -> {
             final Object[] args = inv.getArguments();
@@ -101,6 +102,7 @@ protected static void mockRegisteredServiceProvider(SamlIdentityProvider idp, St
             Mockito.any(ActionListener.class));
     }
 
+    @SuppressWarnings("unchecked")
     protected static void mockRegisteredServiceProvider(SamlServiceProviderResolver resolverMock, String entityId,
                                                         SamlServiceProvider sp) {
         Mockito.doAnswer(inv -> {