diff --git a/django_q/cluster.py b/django_q/cluster.py
index 3eed195..e2e6f5b 100644
--- a/django_q/cluster.py
+++ b/django_q/cluster.py
@@ -275,8 +275,10 @@ class Sentinel(object):
         # Wait for the result queue to empty
         self.result_queue.join_thread()
         logger.info('{} waiting for the monitor.'.format(name))
-        count = 0
         # Wait for everything to close or time out
+        count = 0
+        if not self.timeout:
+            self.timeout = 30
         while self.status() == Conf.STOPPING and count < self.timeout * 5:
             sleep(0.2)
             Stat(self).save()
diff --git a/django_q/tests/settings.py b/django_q/tests/settings.py
index 5717601..a62b93e 100644
--- a/django_q/tests/settings.py
+++ b/django_q/tests/settings.py
@@ -103,6 +103,4 @@ LOGGING = {
 STATIC_URL = '/static/'
 
 # Django Q specific
-Q_CLUSTER = {'name': 'django_q_test',
-             'timeout': 60,
-             'recycle': 100}
+Q_CLUSTER = {'name': 'django_q_test'}