diff --git a/settings.py b/settings.py
index 2f20ed18bae1c756a2cdb82788af430e54389482..32769792e235207c8e79a46942056972dcacf343 100644
--- a/settings.py
+++ b/settings.py
@@ -269,8 +269,9 @@ logging.basicConfig(
 
 
 # set up celery
-CELERY_BROKER_URL = 'amqp://localhost'
-CELERY_TASK_ALWAYS_EAGER = True
+CELERY_BROKER_URL = get_from_env('CELERY_BROKER_URL', 'amqp://localhost')
+if TESTING:
+    CELERY_TASK_ALWAYS_EAGER = True
 #database_url = DATABASES['default']
 
 # Rollbar Error Logging