diff --git a/config.py b/config.py
index ca7ab0a9d..b05319836 100644
--- a/config.py
+++ b/config.py
@@ -97,7 +97,7 @@ class Config(object):
     FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY")
     LOADTESTING_NUMBER = os.getenv('LOADTESTING_NUMBER')
     LOADTESTING_API_KEY = os.getenv("LOADTESTING_API_KEY")
-    CSV_UPLOAD_BUCKET_NAME = 'local-notifications-csv-upload'
+    CSV_UPLOAD_BUCKET_NAME = os.getenv("CSV_UPLOAD_BUCKET_NAME")
     NOTIFICATIONS_ALERT = 5  # five mins
     FROM_NUMBER = os.getenv('FROM_NUMBER')
 
@@ -111,11 +111,10 @@ class Config(object):
 
 class Development(Config):
     DEBUG = True
-    CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload'
 
 
 class Preview(Config):
-    CSV_UPLOAD_BUCKET_NAME = 'preview-notifications-csv-upload'
+    CSV_UPLOAD_BUCKET_NAME = os.getenv("CSV_UPLOAD_BUCKET_NAME")
 
 
 class Test(Development):
@@ -123,13 +122,13 @@ class Test(Development):
 
 
 class Staging(Config):
-   CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload'
+    CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload'
 
 
 class Live(Config):
     CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
     STATSD_ENABLED = True
-   
+
 
 configs = {
     'development': Development,
diff --git a/environment_test.sh b/environment_test.sh
index 010810394..d4665632b 100644
--- a/environment_test.sh
+++ b/environment_test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-export NOTIFY_API_ENVIRONMENT='config.Test'
+export NOTIFY_ENVIRONMENT='test'
 export ADMIN_BASE_URL='http://localhost:6012'
 export ADMIN_CLIENT_USER_NAME='dev-notify-admin'
 export ADMIN_CLIENT_SECRET='dev-notify-secret-key'