diff --git a/.circleci/config.yml b/.circleci/config.yml
index 74a1ad29b8c87afe63e0412e573b3af8a538f751..e65acb0ccc118a07422f25920b368187cc38ba60 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
           DATABASE_URL: postgresql://root@localhost/opentech?sslmode=disable
           PGHOST: localhost
           PGUSER: root
-          DJANGO_SETTINGS_MODULE: opentech.settings.test
+          DJANGO_SETTINGS_MODULE: opentech.settings.production
           NPM_CONFIG_PRODUCTION: false
           SEND_MESSAGES: false
 
@@ -84,4 +84,3 @@ jobs:
       - store_artifacts:
           path: test-reports
           destination: test-reports
-
diff --git a/.travis.yml b/.travis.yml
index bbba2b9790fd58ed8f5eb31a9696dfe01d677411..e726c001756226ce11e747af139a848cec176e52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,6 @@ env:
   global:
     - DJANGO_SETTINGS_MODULE=opentech.settings.production
     - DATABASE_URL=postgres://postgres@localhost/test_db
-    - CFG_SECRET_KEY=iamnotsosecret
-    - CFG_ALLOWED_HOSTS=localhost
 
 before_script:
   # Create a database
diff --git a/opentech/settings/test.py b/opentech/settings/test.py
deleted file mode 100644
index 0be3a21d179be598855e696212b2434fc0ab688a..0000000000000000000000000000000000000000
--- a/opentech/settings/test.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import os
-import dj_database_url
-
-from .base import *  # noqa
-
-# Do not set SECRET_KEY, Postgres or LDAP password or any other sensitive data here.
-# Instead, use environment variables or create a local.py file on the server.
-
-DEBUG = True
-
-
-# Cache everything for 10 minutes
-# This only applies to pages that do not have a more specific cache-control
-# setting. See urls.py
-CACHE_CONTROL_MAX_AGE = 600
-
-
-# Configuration from environment variables
-# Alternatively, you can set these in a local.py file on the server
-
-env = os.environ.copy()
-
-# Basic configuration
-
-APP_NAME = env.get('APP_NAME', 'opentech')
-
-SECURE_SSL_REDIRECT = False
-
-if 'DATABASE_URL' in os.environ:
-    DATABASES = {'default': dj_database_url.config()}
-
-if 'SECRET_KEY' in env:
-    SECRET_KEY = env['SECRET_KEY']
-
-# Email config
-
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'