diff --git a/src/main/java/org/elasticsearch/alerts/AlertManager.java b/src/main/java/org/elasticsearch/alerts/AlertManager.java
index 2eb65bbbe86..817529137a6 100644
--- a/src/main/java/org/elasticsearch/alerts/AlertManager.java
+++ b/src/main/java/org/elasticsearch/alerts/AlertManager.java
@@ -135,9 +135,11 @@ public class AlertManager extends AbstractComponent {
 
     public void stop() {
         if (started.compareAndSet(true, false)) {
+            logger.info("Stopping alert manager...");
             scheduler.stop();
             actionManager.stop();
             alertsStore.stop();
+            logger.info("Alert manager has stopped");
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/alerts/AlertsStore.java b/src/main/java/org/elasticsearch/alerts/AlertsStore.java
index d57224283d5..1bf2b5cbe84 100644
--- a/src/main/java/org/elasticsearch/alerts/AlertsStore.java
+++ b/src/main/java/org/elasticsearch/alerts/AlertsStore.java
@@ -198,6 +198,7 @@ public class AlertsStore extends AbstractComponent {
     public void stop() {
         state.set(State.STOPPED);
         clear();
+        logger.info("Stopped alert store");
     }
 
     private IndexResponse persistAlert(String alertName, BytesReference alertSource, IndexRequest.OpType opType) {
diff --git a/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java b/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java
index 78c2904cb4a..69ec5777643 100644
--- a/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java
+++ b/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java
@@ -128,9 +128,9 @@ public class AlertActionManager extends AbstractComponent {
 
     public void stop() {
         if (state.compareAndSet(State.STARTED, State.STOPPED)) {
-            logger.info("Stopping job queue...");
             actionsToBeProcessed.clear();
             actionsToBeProcessed.add(END_ENTRY);
+            logger.info("Stopped job queue");
         }
     }
 
diff --git a/src/main/java/org/elasticsearch/alerts/scheduler/AlertScheduler.java b/src/main/java/org/elasticsearch/alerts/scheduler/AlertScheduler.java
index d932afee2ef..85a841d9d6b 100644
--- a/src/main/java/org/elasticsearch/alerts/scheduler/AlertScheduler.java
+++ b/src/main/java/org/elasticsearch/alerts/scheduler/AlertScheduler.java
@@ -43,10 +43,10 @@ public class AlertScheduler extends AbstractComponent {
 
     public void stop() {
         try {
-            logger.info("Stopping scheduler");
             if (!scheduler.isShutdown()) {
                 scheduler.clear();
                 scheduler.shutdown(false);
+                logger.info("Stopped scheduler");
             }
         } catch (SchedulerException se){
             logger.error("Failed to stop quartz scheduler", se);
diff --git a/src/test/java/org/elasticsearch/alerts/BasicAlertingTest.java b/src/test/java/org/elasticsearch/alerts/BasicAlertingTest.java
index d3b38a3a86a..effb4265b9e 100644
--- a/src/test/java/org/elasticsearch/alerts/BasicAlertingTest.java
+++ b/src/test/java/org/elasticsearch/alerts/BasicAlertingTest.java
@@ -22,7 +22,7 @@ import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
-import org.junit.Before;
+import org.junit.After;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -103,7 +103,7 @@ public class BasicAlertingTest extends ElasticsearchIntegrationTest {
         assertHitCount(client().prepareCount(AlertsStore.ALERT_INDEX).get(), 0l);
     }
 
-    @Before
+    @After
     public void clearAlerts() {
         // Clear all in-memory alerts on all nodes, perhaps there isn't an elected master at this point
         for (AlertManager manager : internalCluster().getInstances(AlertManager.class)) {