diff --git a/settings/default.py b/settings/default.py
index fe4fed4592b3ea5a687c99f6d0ff532bb00098ee..6188c744524750c624f584ede9b7845506c535e9 100644
--- a/settings/default.py
+++ b/settings/default.py
@@ -13,7 +13,6 @@ USE_TZ = True
 ALLOWED_HOSTS = ['*']
 
 DEBUG = False
-TEMPLATE_DEBUG = DEBUG
 MAINTENANCE_MODE = False
 
 ADMINS = (
@@ -242,15 +241,16 @@ TEMPLATES = [
         ],
         'APP_DIRS': True,
         'OPTIONS': {
+            'debug': True,
             'context_processors': [
                 # Defaults
                 'django.contrib.auth.context_processors.auth',
-                'django.core.context_processors.debug',
-                'django.core.context_processors.i18n',
-                'django.core.context_processors.media',
-                'django.core.context_processors.static',
+                'django.template.context_processors.debug',
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.media',
+                'django.template.context_processors.static',
                 # Extra additions
-                'django.core.context_processors.request',
+                'django.template.context_processors.request',
                 'gracedb.middleware.auth.LigoAuthContext',
                 'middleware.debug.LigoDebugContext',
                 'ligoauth.context_processors.shib_login_url',
diff --git a/settings/test.py b/settings/test.py
index ed4e677d4e238551b26a5d5c7b34610dac9da890..e268f83161da4c3d7d63862b9b0219b5b735fa55 100644
--- a/settings/test.py
+++ b/settings/test.py
@@ -4,8 +4,6 @@ CONFIG_NAME = "TEST"
 
 # Debug settings
 DEBUG = True
-# Template debugging help
-TEMPLATE_DEBUG = DEBUG
 # Don't let debug toolbar edit settings
 DEBUG_TOOLBAR_PATCH_SETTINGS = False