diff --git a/django_q/tests/tasks.py b/django_q/tests/tasks.py
index 70eb782..62e5674 100644
--- a/django_q/tests/tasks.py
+++ b/django_q/tests/tasks.py
@@ -1,3 +1,6 @@
+from time import sleep
+
+
 def countdown(n):
     while n > 0:
         n -= 1
@@ -22,6 +25,11 @@ def word_multiply(x, word=''):
     return len(word) * x
 
 
+def count_forever():
+    while True:
+        sleep(0.5)
+
+
 def get_task_name(task):
     return task.name
 
diff --git a/django_q/tests/test_brokers.py b/django_q/tests/test_brokers.py
index de3b9f3..6a62b08 100644
--- a/django_q/tests/test_brokers.py
+++ b/django_q/tests/test_brokers.py
@@ -37,7 +37,11 @@ def test_redis():
 
 
 def test_disque():
-    Conf.DISQUE_NODES = ['127.0.0.1:7711']
+    # Either local disque or Heroku Tynd
+    Conf.DISQUE_NODES = os.getenv('TYND_DISQUE_NODES', ['127.0.0.1:7711'])
+    if os.getenv('TYND_DISQUE_AUTH', False):
+        Conf.DISQUE_AUTH = os.environ['TYND_DISQUE_AUTH']
+    # check broker
     broker = get_broker(list_key='disque_test')
     assert broker.ping() is True
     assert broker.info() is not None