diff --git a/waterbutler/server/settings.py b/waterbutler/server/settings.py
index c722d4a14..49d4746be 100644
--- a/waterbutler/server/settings.py
+++ b/waterbutler/server/settings.py
@@ -42,3 +42,16 @@
 
 # number of reqests permitted while the redis key is active
 RATE_LIMITING_FIXED_WINDOW_LIMIT = int(config.get('RATE_LIMITING_FIXED_WINDOW_LIMIT', 3600))
+
+# test env envar mapping
+ENABLE_RATE_LIMITING = True
+
+if settings.TEMP_REDIS_DOMAIN is not None:
+    print('SETTING REDIS_DOMAIN to: "{}"'.format(settings.TEMP_REDIS_DOMAIN))
+    REDIS_DOMAIN = settings.TEMP_REDIS_DOMAIN
+
+if settings.TEMP_REDIS_PORT is not None:
+    REDIS_PORT = settings.TEMP_REDIS_PORT
+
+RATE_LIMITING_FIXED_WINDOW_SIZE = 360
+RATE_LIMITING_FIXED_WINDOW_LIMIT = 30
diff --git a/waterbutler/settings.py b/waterbutler/settings.py
index 4a2b96081..d8e9827de 100644
--- a/waterbutler/settings.py
+++ b/waterbutler/settings.py
@@ -184,3 +184,7 @@ def child(key):
 WEBDAV_METHODS = {'PROPFIND', 'MKCOL', 'MOVE', 'COPY'}
 
 AIOHTTP_TIMEOUT = int(config.get('AIOHTTP_TIMEOUT', 3600))  # time in seconds
+
+# test env envar mapping
+TEMP_REDIS_DOMAIN = config.get('S3WB_REDIS_PORT_6379_TCP_ADDR')
+TEMP_REDIS_PORT = config.get('S3WB_REDIS_PORT_6379_TCP_PORT')