--- a/vm-jmx/client-cli/src/test/java/com/redhat/thermostat/vm/jmx/client/cli/NotificationsCommandTest.java	Fri Dec 09 14:11:16 2016 -0500
+++ b/vm-jmx/client-cli/src/test/java/com/redhat/thermostat/vm/jmx/client/cli/NotificationsCommandTest.java	Wed Dec 14 10:29:05 2016 -0500
@@ -74,6 +74,7 @@
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
@@ -424,11 +425,7 @@
             }
         });
         helper.start();
-        try {
-            Thread.sleep(750);
-            timerFactory.getAction().run();
-        } catch (InterruptedException ignored) {
-        }
+        runTimerFactoryAction();
         when(inStream.available()).thenReturn(1);
         try {
             helper.join();
@@ -461,11 +458,7 @@
             }
         });
         helper.start();
-        try {
-            Thread.sleep(750);
-            timerFactory.getAction().run();
-        } catch (InterruptedException ignored) {
-        }
+        runTimerFactoryAction();
         jmxNotificationStatus.setEnabled(false);
         try {
             helper.join();
@@ -561,4 +554,19 @@
         when(args.getSubcommand()).thenReturn(subcommand);
     }
 
+    private void runTimerFactoryAction() {
+        long startTime = System.nanoTime();
+        while(!timerFactory.isActive()) {
+            long elapsedTime = System.nanoTime() - startTime;
+            if (elapsedTime > TimeUnit.NANOSECONDS.convert(5, TimeUnit.SECONDS)) {
+                fail("Timer took more than 1 second to be created.");
+            }
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ignored) {
+            }
+        }
+        timerFactory.getAction().run();
+    }
+
 }