diff --git a/shield/src/test/java/org/elasticsearch/shield/audit/AuditTrailModuleTests.java b/shield/src/test/java/org/elasticsearch/shield/audit/AuditTrailModuleTests.java
index 9e2e3065323..b82b8ab6f71 100644
--- a/shield/src/test/java/org/elasticsearch/shield/audit/AuditTrailModuleTests.java
+++ b/shield/src/test/java/org/elasticsearch/shield/audit/AuditTrailModuleTests.java
@@ -9,6 +9,7 @@ import org.elasticsearch.Version;
 import org.elasticsearch.common.inject.Guice;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.common.settings.SettingsModule;
 import org.elasticsearch.indices.breaker.CircuitBreakerModule;
 import org.elasticsearch.shield.audit.logfile.LoggingAuditTrail;
@@ -30,7 +31,7 @@ public class AuditTrailModuleTests extends ESTestCase {
                 .put("client.type", "node")
                 .put("shield.audit.enabled", false)
                 .build();
-        Injector injector = Guice.createInjector(new SettingsModule(settings), new AuditTrailModule(settings));
+        Injector injector = Guice.createInjector(new SettingsModule(settings, new SettingsFilter(settings)), new AuditTrailModule(settings));
         AuditTrail auditTrail = injector.getInstance(AuditTrail.class);
         assertThat(auditTrail, is(AuditTrail.NOOP));
     }
@@ -38,7 +39,7 @@ public class AuditTrailModuleTests extends ESTestCase {
     public void testDisabledByDefault() throws Exception {
         Settings settings = Settings.builder()
                 .put("client.type", "node").build();
-        Injector injector = Guice.createInjector(new SettingsModule(settings), new AuditTrailModule(settings));
+        Injector injector = Guice.createInjector(new SettingsModule(settings, new SettingsFilter(settings)), new AuditTrailModule(settings));
         AuditTrail auditTrail = injector.getInstance(AuditTrail.class);
         assertThat(auditTrail, is(AuditTrail.NOOP));
     }
@@ -50,7 +51,7 @@ public class AuditTrailModuleTests extends ESTestCase {
                 .build();
         ThreadPool pool = new ThreadPool("testLogFile");
         try {
-            Injector injector = Guice.createInjector(new SettingsModule(settings), new AuditTrailModule(settings), new TransportModule(settings), new CircuitBreakerModule(settings), new ThreadPoolModule(pool), new Version.Module(Version.CURRENT));
+            Injector injector = Guice.createInjector(new SettingsModule(settings, new SettingsFilter(settings)), new AuditTrailModule(settings), new TransportModule(settings), new CircuitBreakerModule(settings), new ThreadPoolModule(pool), new Version.Module(Version.CURRENT));
             AuditTrail auditTrail = injector.getInstance(AuditTrail.class);
             assertThat(auditTrail, instanceOf(AuditTrailService.class));
             AuditTrailService service = (AuditTrailService) auditTrail;
@@ -69,7 +70,7 @@ public class AuditTrailModuleTests extends ESTestCase {
                 .put("client.type", "node")
                 .build();
         try {
-            Guice.createInjector(new SettingsModule(settings), new AuditTrailModule(settings));
+            Guice.createInjector(new SettingsModule(settings, new SettingsFilter(settings)), new AuditTrailModule(settings));
             fail("Expect initialization to fail when an unknown audit trail output is configured");
         } catch (Throwable t) {
             // expected
diff --git a/shield/src/test/java/org/elasticsearch/shield/authc/AuthenticationModuleTests.java b/shield/src/test/java/org/elasticsearch/shield/authc/AuthenticationModuleTests.java
index 40eea778378..e9d74f77d2a 100644
--- a/shield/src/test/java/org/elasticsearch/shield/authc/AuthenticationModuleTests.java
+++ b/shield/src/test/java/org/elasticsearch/shield/authc/AuthenticationModuleTests.java
@@ -9,6 +9,7 @@ import org.elasticsearch.ElasticsearchSecurityException;
 import org.elasticsearch.common.inject.Guice;
 import org.elasticsearch.common.inject.Injector;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.settings.SettingsFilter;
 import org.elasticsearch.common.settings.SettingsModule;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.EnvironmentModule;
@@ -78,7 +79,7 @@ public class AuthenticationModuleTests extends ESTestCase {
         Environment env = new Environment(settings);
         ThreadPool pool = new ThreadPool(settings);
         try {
-            Injector injector = Guice.createInjector(module, new SettingsModule(settings), new AuditTrailModule(settings), new CryptoModule(settings), new EnvironmentModule(env), new ThreadPoolModule(pool));
+            Injector injector = Guice.createInjector(module, new SettingsModule(settings, new SettingsFilter(settings)), new AuditTrailModule(settings), new CryptoModule(settings), new EnvironmentModule(env), new ThreadPoolModule(pool));
             Realms realms = injector.getInstance(Realms.class);
             Realm.Factory factory = realms.realmFactory("custom");
             assertThat(factory, notNullValue());
@@ -106,7 +107,7 @@ public class AuthenticationModuleTests extends ESTestCase {
         ThreadPool pool = new ThreadPool(settings);
 
         try {
-            Injector injector = Guice.createInjector(module, new SettingsModule(settings), new AuditTrailModule(settings), new CryptoModule(settings), new EnvironmentModule(env), new ThreadPoolModule(pool));
+            Injector injector = Guice.createInjector(module, new SettingsModule(settings, new SettingsFilter(settings)), new AuditTrailModule(settings), new CryptoModule(settings), new EnvironmentModule(env), new ThreadPoolModule(pool));
             AuthenticationFailureHandler failureHandler = injector.getInstance(AuthenticationFailureHandler.class);
             assertThat(failureHandler, notNullValue());
             assertThat(failureHandler, instanceOf(DefaultAuthenticationFailureHandler.class));
@@ -130,7 +131,7 @@ public class AuthenticationModuleTests extends ESTestCase {
         ThreadPool pool = new ThreadPool(settings);
 
         try {
-            Injector injector = Guice.createInjector(module, new SettingsModule(settings), new AuditTrailModule(settings), new CryptoModule(settings), new EnvironmentModule(env), new ThreadPoolModule(pool));
+            Injector injector = Guice.createInjector(module, new SettingsModule(settings, new SettingsFilter(settings)), new AuditTrailModule(settings), new CryptoModule(settings), new EnvironmentModule(env), new ThreadPoolModule(pool));
             AuthenticationFailureHandler failureHandler = injector.getInstance(AuthenticationFailureHandler.class);
             assertThat(failureHandler, notNullValue());
             assertThat(failureHandler, instanceOf(NoOpFailureHandler.class));