diff --git a/config.py b/config.py
index 6541b8f65..d234e8b63 100644
--- a/config.py
+++ b/config.py
@@ -84,11 +84,7 @@ class Config(object):
     CELERY_QUEUES = [
         Queue('periodic', Exchange('default'), routing_key='periodic'),
         Queue('sms', Exchange('default'), routing_key='sms'),
-        Queue('db-sms', Exchange('default'), routing_key='db-sms'),
-        Queue('send-sms', Exchange('default'), routing_key='send-sms'),
         Queue('email', Exchange('default'), routing_key='email'),
-        Queue('db-email', Exchange('default'), routing_key='db-email'),
-        Queue('send-email', Exchange('default'), routing_key='send-email'),
         Queue('sms-code', Exchange('default'), routing_key='sms-code'),
         Queue('email-code', Exchange('default'), routing_key='email-code'),
         Queue('email-reset-password', Exchange('default'), routing_key='email-reset-password'),
@@ -123,6 +119,26 @@ class Development(Config):
     NOTIFY_ENVIRONMENT = 'development'
     CSV_UPLOAD_BUCKET_NAME = 'development-notifications-csv-upload'
     DEBUG = True
+    SQLALCHEMY_ECHO = False
+    CELERY_QUEUES = Config.CELERY_QUEUES + [
+        Queue('db-sms', Exchange('default'), routing_key='db-sms'),
+        Queue('send-sms', Exchange('default'), routing_key='send-sms'),
+        Queue('db-email', Exchange('default'), routing_key='db-email'),
+        Queue('send-email', Exchange('default'), routing_key='send-email')
+    ]
+
+
+class Test(Config):
+    NOTIFY_ENVIRONMENT = 'test'
+    DEBUG = True
+    CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload'
+    STATSD_PREFIX = "test"
+    CELERY_QUEUES = Config.CELERY_QUEUES + [
+        Queue('db-sms', Exchange('default'), routing_key='db-sms'),
+        Queue('send-sms', Exchange('default'), routing_key='send-sms'),
+        Queue('db-email', Exchange('default'), routing_key='db-email'),
+        Queue('send-email', Exchange('default'), routing_key='send-email')
+    ]
 
 
 class Preview(Config):
@@ -131,12 +147,6 @@ class Preview(Config):
     STATSD_PREFIX = "preview"
 
 
-class Test(Development):
-    NOTIFY_ENVIRONMENT = 'test'
-    CSV_UPLOAD_BUCKET_NAME = 'test-notifications-csv-upload'
-    STATSD_PREFIX = "test"
-
-
 class Staging(Config):
     NOTIFY_ENVIRONMENT = 'staging'
     CSV_UPLOAD_BUCKET_NAME = 'staging-notify-csv-upload'
@@ -147,7 +157,6 @@ class Staging(Config):
 class Live(Config):
     NOTIFY_ENVIRONMENT = 'live'
     CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
-    STATSD_ENABLED = True
     STATSD_PREFIX = os.getenv('STATSD_PREFIX')
     STATSD_ENABLED = True
 
diff --git a/scripts/aws_start_app.sh b/scripts/aws_start_app.sh
index 7be657a03..47f7103ba 100755
--- a/scripts/aws_start_app.sh
+++ b/scripts/aws_start_app.sh
@@ -12,6 +12,18 @@ then
   sudo service notifications-api-celery-worker start
 fi
 
+if [ -e "/etc/init/notifications-api-celery-worker-sender.conf" ]
+then
+  echo "Starting celery worker"
+  sudo service notifications-api-celery-worker-sender start
+fi
+
+if [ -e "/etc/init/notifications-api-celery-worker-db.conf" ]
+then
+  echo "Starting celery worker"
+  sudo service notifications-api-celery-worker-db start
+fi
+
 if [ -e "/etc/init/notifications-api-celery-beat.conf" ]
 then
   echo "Starting celery beat"
diff --git a/scripts/aws_stop_app.sh b/scripts/aws_stop_app.sh
index 2f5660ae1..3f9735d4b 100755
--- a/scripts/aws_stop_app.sh
+++ b/scripts/aws_stop_app.sh
@@ -19,7 +19,7 @@ fi
 if [ -e "/etc/init/notifications-api-celery-beat.conf" ]; then
     echo "stopping notifications-api-celery-beat"
     if sudo service notifications-api-celery-beat stop; then
-        echo "notifications-api stopped"
+        echo "notifications-api beat stopped"
     else
         error_exit "Could not stop notifications-celery-beat"
     fi
@@ -28,8 +28,26 @@ fi
 if [ -e "/etc/init/notifications-api-celery-worker.conf" ]; then
     echo "stopping notifications-api-celery-worker"
     if sudo service notifications-api-celery-worker stop; then
-        echo "notifications-api stopped"
+        echo "notifications-api worker stopped"
     else
         error_exit "Could not stop notifications-celery-worker"
     fi
 fi
+
+if [ -e "/etc/init/notifications-api-celery-worker-sender.conf" ]; then
+    echo "stopping notifications-api-celery-worker-sender"
+    if sudo service notifications-api-celery-worker-sender stop; then
+        echo "notifications-api sender worker stopped"
+    else
+        error_exit "Could not stop notifications-celery-worker-sender"
+    fi
+fi
+
+if [ -e "/etc/init/notifications-api-celery-worker-db.conf" ]; then
+    echo "stopping notifications-api-celery-worker-db"
+    if sudo service notifications-api-celery-worker-db stop; then
+        echo "notifications-api db worker stopped"
+    else
+        error_exit "Could not stop notifications-celery-worker-db"
+    fi
+fi