diff --git a/django/contrib/auth/tests/__init__.py b/django/contrib/auth/tests/__init__.py
index 2d7d0fa1a12..a7cc0045079 100644
--- a/django/contrib/auth/tests/__init__.py
+++ b/django/contrib/auth/tests/__init__.py
@@ -2,6 +2,7 @@ from django.contrib.auth.tests.auth_backends import (BackendTest,
     RowlevelBackendTest, AnonymousUserBackendTest, NoAnonymousUserBackendTest,
     NoBackendsTest, InActiveUserBackendTest, NoInActiveUserBackendTest)
 from django.contrib.auth.tests.basic import BasicTestCase
+from django.contrib.auth.tests.context_processors import AuthContextProcessorTests
 from django.contrib.auth.tests.decorators import LoginRequiredTestCase
 from django.contrib.auth.tests.forms import (UserCreationFormTest,
     AuthenticationFormTest, SetPasswordFormTest, PasswordChangeFormTest,
diff --git a/django/contrib/auth/tests/context_processors.py b/django/contrib/auth/tests/context_processors.py
index c008e7098cb..49172c60e0c 100644
--- a/django/contrib/auth/tests/context_processors.py
+++ b/django/contrib/auth/tests/context_processors.py
@@ -1,16 +1,27 @@
-# from django.conf import settings
+import os
+
+from django.conf import settings
 from django.contrib.auth import authenticate
 from django.db.models import Q
 from django.test import TestCase
-# from django.template import Template
+
 
 class AuthContextProcessorTests(TestCase):
     """
     Tests for the ``django.contrib.auth.context_processors.auth`` processor
     """
-    urls = 'regressiontests.context_processors.urls'
+    urls = 'django.contrib.auth.tests.urls'
     fixtures = ['context-processors-users.xml']
 
+    def setUp(self):
+        self.old_TEMPLATE_DIRS = settings.TEMPLATE_DIRS
+        settings.TEMPLATE_DIRS = (
+            os.path.join(os.path.dirname(__file__), 'templates'),
+        )
+
+    def tearDown(self):
+        settings.TEMPLATE_DIRS = self.old_TEMPLATE_DIRS
+
     def test_session_not_accessed(self):
         """
         Tests that the session is not accessed simply by including
@@ -74,4 +85,4 @@ class AuthContextProcessorTests(TestCase):
         # equality in a non-duck-typing way
         # See bug #12060
         self.assertEqual(response.context['user'], user)
-        self.assertEqual(user, response.context['user'])
\ No newline at end of file
+        self.assertEqual(user, response.context['user'])
diff --git a/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_access.html b/django/contrib/auth/tests/templates/context_processors/auth_attrs_access.html
similarity index 100%
rename from tests/regressiontests/context_processors/templates/context_processors/auth_attrs_access.html
rename to django/contrib/auth/tests/templates/context_processors/auth_attrs_access.html
diff --git a/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_messages.html b/django/contrib/auth/tests/templates/context_processors/auth_attrs_messages.html
similarity index 100%
rename from tests/regressiontests/context_processors/templates/context_processors/auth_attrs_messages.html
rename to django/contrib/auth/tests/templates/context_processors/auth_attrs_messages.html
diff --git a/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_no_access.html b/django/contrib/auth/tests/templates/context_processors/auth_attrs_no_access.html
similarity index 100%
rename from tests/regressiontests/context_processors/templates/context_processors/auth_attrs_no_access.html
rename to django/contrib/auth/tests/templates/context_processors/auth_attrs_no_access.html
diff --git a/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_perms.html b/django/contrib/auth/tests/templates/context_processors/auth_attrs_perms.html
similarity index 100%
rename from tests/regressiontests/context_processors/templates/context_processors/auth_attrs_perms.html
rename to django/contrib/auth/tests/templates/context_processors/auth_attrs_perms.html
diff --git a/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_test_access.html b/django/contrib/auth/tests/templates/context_processors/auth_attrs_test_access.html
similarity index 100%
rename from tests/regressiontests/context_processors/templates/context_processors/auth_attrs_test_access.html
rename to django/contrib/auth/tests/templates/context_processors/auth_attrs_test_access.html
diff --git a/tests/regressiontests/context_processors/templates/context_processors/auth_attrs_user.html b/django/contrib/auth/tests/templates/context_processors/auth_attrs_user.html
similarity index 100%
rename from tests/regressiontests/context_processors/templates/context_processors/auth_attrs_user.html
rename to django/contrib/auth/tests/templates/context_processors/auth_attrs_user.html
diff --git a/django/contrib/auth/tests/urls.py b/django/contrib/auth/tests/urls.py
index 1407cda895a..4445a9c0149 100644
--- a/django/contrib/auth/tests/urls.py
+++ b/django/contrib/auth/tests/urls.py
@@ -1,8 +1,11 @@
 from django.conf.urls.defaults import patterns, url
+from django.contrib.auth import context_processors
 from django.contrib.auth.urls import urlpatterns
 from django.contrib.auth.views import password_reset
 from django.contrib.auth.decorators import login_required
+from django.contrib.messages.api import info
 from django.http import HttpResponse
+from django.shortcuts import render_to_response
 from django.template import Template, RequestContext
 from django.views.decorators.cache import never_cache
 
@@ -35,7 +38,7 @@ def auth_processor_perms(request):
         RequestContext(request, {}, processors=[context_processors.auth]))
 
 def auth_processor_messages(request):
-    request.user.message_set.create(message="Message 1")
+    info(request, "Message 1")
     return render_to_response('context_processors/auth_attrs_messages.html',
          RequestContext(request, {}, processors=[context_processors.auth]))