diff --git a/ckan/config/environment.py b/ckan/config/environment.py
index f873921866c..92c6955cb1e 100644
--- a/ckan/config/environment.py
+++ b/ckan/config/environment.py
@@ -193,7 +193,8 @@ def find_controller(self, controller):
         template_paths = [legacy_templates_path]
         # if we are testing allow new templates
         if asbool(config.get('ckan.enable_testing', 'false')):
-            template_paths = [paths['templates'][0]]
+            jinja2_templates_path = os.path.join(root, 'templates')
+            template_paths.append(jinja2_templates_path)
     else:
         template_paths = [paths['templates'][0]]
         template_paths.append(legacy_templates_path)