diff --git a/src/main/java/org/elasticsearch/alerts/ConfigurationManager.java b/src/main/java/org/elasticsearch/alerts/ConfigurationManager.java
index 6ef4f2737a6..f7bf0390da5 100644
--- a/src/main/java/org/elasticsearch/alerts/ConfigurationManager.java
+++ b/src/main/java/org/elasticsearch/alerts/ConfigurationManager.java
@@ -25,8 +25,8 @@ public class ConfigurationManager extends AbstractComponent {
 
     private final Client client;
 
-    public final String CONFIG_TYPE = "config";
-    public final String CONFIG_INDEX = AlertsStore.ALERT_INDEX;
+    public static final String CONFIG_TYPE = "config";
+    public static final String CONFIG_INDEX = AlertsStore.ALERT_INDEX;
     private final String GLOBAL_CONFIG_NAME = "global";
     private final Settings settings;
     private volatile boolean readyToRead = false;
diff --git a/src/test/java/org/elasticsearch/alerts/ConfigTest.java b/src/test/java/org/elasticsearch/alerts/ConfigTest.java
new file mode 100644
index 00000000000..5f68f11fd1b
--- /dev/null
+++ b/src/test/java/org/elasticsearch/alerts/ConfigTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+package org.elasticsearch.alerts;
+
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.common.settings.ImmutableSettings;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
+import org.elasticsearch.test.ElasticsearchIntegrationTest;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+
+/**
+ */
+public class ConfigTest extends ElasticsearchIntegrationTest {
+
+    public void testOverridingSettings() throws Exception {
+        TimeValue tv = TimeValue.timeValueMillis(10000);
+        Settings oldSettings = ImmutableSettings.builder()
+                .put("foo", tv)
+                .put("bar", 1)
+                .put("baz", true)
+                .build();
+        ConfigurationManager configurationManager = new ConfigurationManager(oldSettings, client());
+
+        ClusterState clusterState = internalCluster().clusterService().state();
+        boolean isReady = configurationManager.isReady(clusterState);
+        assertTrue(isReady); //Should always be ready on a clean start
+        Settings newSettings = ImmutableSettings.builder()
+                .build();
+        assertThat(configurationManager.getOverriddenIntValue("bar", newSettings, 0), equalTo(1));
+        assertThat(configurationManager.getOverriddenBooleanValue("baz", newSettings, false), equalTo(true));
+        assertThat(configurationManager.getOverriddenTimeValue("foo", newSettings, TimeValue.timeValueMillis(0)).getMillis(), equalTo(tv.getMillis()));
+        TimeValue tv2 = TimeValue.timeValueMillis(0);
+        newSettings = ImmutableSettings.builder()
+                .put("foo", tv2)
+                .put("bar", 100)
+                .put("baz", false)
+                .build();
+        assertThat(configurationManager.getOverriddenIntValue("bar", newSettings, 0), equalTo(100));
+        assertThat(configurationManager.getOverriddenBooleanValue("baz", newSettings, true), equalTo(false));
+        assertThat(configurationManager.getOverriddenTimeValue("foo", newSettings, TimeValue.timeValueMillis(1)).getMillis(), equalTo(tv2.getMillis()));
+
+    }
+
+    public void testLoadingSettings() throws Exception {
+        TimeValue tv = TimeValue.timeValueMillis(10000);
+        Settings oldSettings = ImmutableSettings.builder()
+                .put("foo", tv)
+                .put("bar", 1)
+                .put("baz", true)
+                .build();
+
+        TimeValue tv2 = TimeValue.timeValueMillis(10);
+        Settings newSettings = ImmutableSettings.builder()
+                .put("foo", tv2)
+                .put("bar", 100)
+                .put("baz", false)
+                .build();
+
+        XContentBuilder jsonBuilder = XContentFactory.jsonBuilder();
+        jsonBuilder.startObject();
+        newSettings.toXContent(jsonBuilder, ToXContent.EMPTY_PARAMS);
+        jsonBuilder.endObject();
+        IndexResponse indexResponse = client()
+                .prepareIndex(ConfigurationManager.CONFIG_INDEX, ConfigurationManager.CONFIG_TYPE, "global")
+                .setSource(jsonBuilder)
+                .get();
+        assertTrue(indexResponse.isCreated());
+        ConfigurationManager configurationManager = new ConfigurationManager(oldSettings, client());
+        assertTrue(configurationManager.isReady(internalCluster().clusterService().state()));
+        Settings loadedSettings = configurationManager.getGlobalConfig();
+        assertThat(loadedSettings.get("foo"), equalTo(newSettings.get("foo")));
+        assertThat(loadedSettings.get("bar"), equalTo(newSettings.get("bar")));
+        assertThat(loadedSettings.get("baz"), equalTo(newSettings.get("baz")));
+    }
+}