diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index 20f194a12e..3ca9b27486 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -15,8 +15,12 @@
     f"redis://:{REDIS_BROKER_PASSWORD}@{REDIS_BROKER_HOST}:{REDIS_BROKER_PORT}/{REDIS_BROKER_DB_INDEX}",
 )
 
-CELERY_BROKER_URL = REDIS_BROKER_URL.replace("unix:", "redis+socket:")
-CELERY_RESULT_BACKEND = REDIS_BROKER_URL.replace("unix:", "redis+socket:")
+CELERY_BROKER_URL = env(
+    "CELERY_BROKER_URL", REDIS_BROKER_URL.replace("unix:", "redis+socket:")
+)
+CELERY_RESULT_BACKEND = env(
+    "CELERY_RESULT_BACKEND", REDIS_BROKER_URL.replace("unix:", "redis+socket:")
+)
 
 CELERY_DEFAULT_QUEUE = "low_priority"
 CELERY_CREATE_MISSING_QUEUES = True
diff --git a/pytest.ini b/pytest.ini
index b963fb316a..74970e877f 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -15,11 +15,8 @@ env =
     ALLOWED_HOSTS = your.domain.here
     BOOKWYRM_DATABASE_BACKEND = postgres
     MEDIA_ROOT = images/
-    CELERY_BROKER =
-    REDIS_BROKER_PORT = 6379
-    REDIS_BROKER_PASSWORD = beep
-    REDIS_ACTIVITY_PORT = 6379
-    REDIS_ACTIVITY_PASSWORD = beep
+    CELERY_BROKER_URL = memory://
+    CELERY_RESULT_BACKEND = cache+memory://
     USE_DUMMY_CACHE = true
     FLOWER_PORT = 8888
     EMAIL_HOST = smtp.mailgun.org