diff --git a/src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs b/src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs
index 8acff9714..3e94350b9 100644
--- a/src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs
+++ b/src/NzbDrone.Core.Test/Messaging/Commands/CommandExecutorFixture.cs
@@ -71,9 +71,9 @@ private void QueueAndWaitForExecution(CommandModel commandModel, bool waitPublis
 
             _commandQueue.Add(commandModel);
 
-            if (!waitEventComplete.Wait(2000))
+            if (!waitEventComplete.Wait(15000))
             {
-                Assert.Fail("Command did not Complete/Fail within 2 sec");
+                Assert.Fail("Command did not Complete/Fail within 15 sec");
             }
 
             if (waitPublish && !waitEventPublish.Wait(500))
@@ -141,7 +141,7 @@ public void broken_executor_should_publish_executed_event()
 
             Subject.Handle(new ApplicationStartedEvent());
 
-            QueueAndWaitForExecution(commandModel);
+            QueueAndWaitForExecution(commandModel, true);
 
             VerifyEventPublished<CommandExecutedEvent>();
 
@@ -160,7 +160,7 @@ public void should_publish_executed_event_on_success()
 
             Subject.Handle(new ApplicationStartedEvent());
 
-            QueueAndWaitForExecution(commandModel);
+            QueueAndWaitForExecution(commandModel, true);
 
             VerifyEventPublished<CommandExecutedEvent>();
         }