diff --git a/src/postorius/tests/test_address_activation.py b/src/postorius/tests/test_address_activation.py
index 8c46f77..adcd29c 100644
--- a/src/postorius/tests/test_address_activation.py
+++ b/src/postorius/tests/test_address_activation.py
@@ -4,6 +4,7 @@
 
 from datetime import datetime, timedelta
 from django.contrib.auth.models import User
+from django.contrib.messages.storage.fallback import FallbackStorage
 from django.core.urlresolvers import reverse
 from django.core import mail
 from django.test.client import Client, RequestFactory
@@ -194,10 +195,10 @@
     def setUp(self):
         # Set up a profile with a predictable key
         self.user = User.objects.create_user(
-            username='ler', email=u'ler@mailman.mostdesirable.org',
+            username='ler', email=u'ler@example.org',
             password='pwd')
         self.profile = AddressConfirmationProfile.objects.create_profile(
-            u'les@mailman.mostdesirable.org', self.user)
+            u'les@example.org', self.user)
         self.profile.activation_key = \
             u'6323fba0097781fdb887cfc37a1122ee7c8bb0b0'
         self.profile.save()
@@ -213,8 +214,11 @@
         request = RequestFactory().get(reverse(
             'address_activation_link', kwargs={
             'activation_key': '6323fba0097781fdb887cfc37a1122ee7c8bb0b0'}))
+        setattr(request, 'session', 'session')
+        messages = FallbackStorage(request)
+        setattr(request, '_messages', messages)
         address_activation_link(
             request, '6323fba0097781fdb887cfc37a1122ee7c8bb0b0')
-        expected_calls = [call(request, u'ler@mailman.mostdesirable.org',
-                         u'les@mailman.mostdesirable.org')]
+        expected_calls = [call(request, u'ler@example.org',
+                         u'les@example.org')]
         self.assertEqual(_add_address_mock.mock_calls, expected_calls)