diff --git a/aleksis/core/tests/views/test_account.py b/aleksis/core/tests/views/test_account.py
index 48cf07028fb2ae232a6b1018550a23e8edb04ff4..ecc15f59920ddb493ae64323a7aa4fbeebdafec4 100644
--- a/aleksis/core/tests/views/test_account.py
+++ b/aleksis/core/tests/views/test_account.py
@@ -9,34 +9,21 @@ pytestmark = pytest.mark.django_db
 def test_index_not_logged_in(client):
     response = client.get("/")
 
-    assert response.status_code == 200
-    assert reverse(settings.LOGIN_URL) in response.content.decode("utf-8")
-
-
-def test_login(client, django_user_model):
-    username = "foo"
-    password = "bar"
-
-    django_user_model.objects.create_user(username=username, password=password)
-    client.login(username=username, password=password)
-
-    response = client.get("/")
+    assert response.status_code == 302
+    assert response['Location'].startswith(reverse(settings.LOGIN_URL))
 
-    assert response.status_code == 200
-    assert reverse(settings.LOGIN_URL) not in response.content.decode("utf-8")
 
-
-def test_index_not_linked_to_person(client, django_user_model):
+def test_login_without_person(client, django_user_model):
     username = "foo"
     password = "bar"
 
     django_user_model.objects.create_user(username=username, password=password)
     client.login(username=username, password=password)
 
-    response = client.get("/")
+    response = client.get("/", follow=True)
 
     assert response.status_code == 200
-    assert "You are not linked to a person" in response.content.decode("utf-8")
+    assert "Your user account is not linked to a person." in response.content.decode("utf-8")
 
 
 def test_logout(client, django_user_model):
@@ -46,10 +33,10 @@ def test_logout(client, django_user_model):
     django_user_model.objects.create_user(username=username, password=password)
     client.login(username=username, password=password)
 
-    response = client.get("/")
+    response = client.get("/", follow=True)
     assert response.status_code == 200
 
     response = client.get(reverse("logout"), follow=True)
 
     assert response.status_code == 200
-    assert reverse(settings.LOGIN_URL) in response.content.decode("utf-8")
+    assert "Enter your credentials." in response.content.decode("utf-8")