diff --git a/config/settings/__init__.py b/config/settings/__init__.py
index 216d070634bded79c26596ce27f209d5a9140290..1f665b4db8c1b08040664074df743190de5a33f4 100644
--- a/config/settings/__init__.py
+++ b/config/settings/__init__.py
@@ -9,11 +9,11 @@ Description of settings files:
     secret.py     - generated by Puppet, contains secret settings like the
                     database password, API keys, etc.
     base.py       - contains the basic settings for running a GraceDB server.
-                    These can be overridden in production.py or test.py. Uses
+                    These can be overridden in production.py or dev.py. Uses
                     settings in local.py and secret.py.
     production.py - defines settings for a production GraceDB instance. Imports
                     base.py settings and overrides/adds settings.
-    test.py       - defines settings for a test/development GraceDB instance.
+    dev.py        - defines settings for a development or testing server.
                     Imports base.py settings and overrides/adds settings.
 """
 
@@ -25,10 +25,10 @@ try:
         settings_file = 'production'
     else:
         # If ./local.py is not found or IS_PRODUCTION_SERVER
-        # is not defined, use test settings
-        settings_file = 'test'
+        # is not defined, use development/test settings
+        settings_file = 'dev'
 except NameError:
-    settings_file = 'test'
+    settings_file = 'dev'
 settings_module = __import__(settings_file, globals(), locals())
 
 # Put these settings into the local scope
diff --git a/config/settings/test.py b/config/settings/dev.py
similarity index 100%
rename from config/settings/test.py
rename to config/settings/dev.py