diff --git a/mamweb/settings_local.py b/mamweb/settings_local.py
index 68030cdd..501326dd 100644
--- a/mamweb/settings_local.py
+++ b/mamweb/settings_local.py
@@ -10,6 +10,9 @@ import os.path
 # Import common settings
 from .settings_common import *
 
+MIDDLEWARE_CLASSES += (
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
+    )
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
@@ -22,7 +25,7 @@ INSTALLED_APPS += (
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
+TEMPLATES[0]['OPTIONS']['debug'] = True
 
 ALLOWED_HOSTS = ['127.0.0.1']
 
@@ -48,7 +51,3 @@ DATABASES = {
 # set to 'DEBUG' for EXTRA verbose output
 LOGGING['handlers']['console']['level'] = 'INFO'
 
-# So that it is not necessary to restart the server every time a template is
-# changed
-TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader')
diff --git a/mamweb/settings_test.py b/mamweb/settings_test.py
index 877b9ac0..0cc44a64 100644
--- a/mamweb/settings_test.py
+++ b/mamweb/settings_test.py
@@ -12,6 +12,9 @@ import os.path
 # Import common settings
 from .settings_common import * # zatim nutne, casem snad vyresime # noqa
 
+MIDDLEWARE_CLASSES += (
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
+    )
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
@@ -27,7 +30,7 @@ SECRET_KEY = ')^u=i65*zmr_k53a*@f4q_+ji^o@!pgpef*5&8c7zzv9l+zo)n'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = False
+TEMPLATES[0]['OPTIONS']['debug'] = True
 
 ALLOWED_HOSTS = ['*.mam.mff.cuni.cz', 'atrey.karlin.mff.cuni.cz', 'mam.mff.cuni.cz', 'mam-test.kam.mff.cuni.cz', 'gimli.ms.mff.cuni.cz']