diff --git a/rdmo/conditions/tests/test_admin.py b/rdmo/conditions/tests/test_admin.py
index d051b6d49e..65bc483aa6 100644
--- a/rdmo/conditions/tests/test_admin.py
+++ b/rdmo/conditions/tests/test_admin.py
@@ -1,9 +1,7 @@
 from django.urls import reverse
 
 
-def test_condition_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_condition_search(admin_client):
     url = reverse('admin:conditions_condition_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
diff --git a/rdmo/domain/tests/test_admin.py b/rdmo/domain/tests/test_admin.py
index 71b2b4ee54..a5408e1f1c 100644
--- a/rdmo/domain/tests/test_admin.py
+++ b/rdmo/domain/tests/test_admin.py
@@ -1,9 +1,7 @@
 from django.urls import reverse
 
 
-def test_attribute_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_attribute_search(admin_client):
     url = reverse('admin:domain_attribute_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
diff --git a/rdmo/options/tests/test_admin.py b/rdmo/options/tests/test_admin.py
index 3a8cbd1b20..cc3aec9653 100644
--- a/rdmo/options/tests/test_admin.py
+++ b/rdmo/options/tests/test_admin.py
@@ -1,17 +1,13 @@
 from django.urls import reverse
 
 
-def test_optionset_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_optionset_search(admin_client):
     url = reverse('admin:options_optionset_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
 
 
-def test_option_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_option_search(admin_client):
     url = reverse('admin:options_option_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
diff --git a/rdmo/questions/tests/test_admin.py b/rdmo/questions/tests/test_admin.py
index fb87bde305..2b49c9b235 100644
--- a/rdmo/questions/tests/test_admin.py
+++ b/rdmo/questions/tests/test_admin.py
@@ -1,41 +1,31 @@
 from django.urls import reverse
 
 
-def test_catalog_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_catalog_search(admin_client):
     url = reverse('admin:questions_catalog_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
 
 
-def test_section_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_section_search(admin_client):
     url = reverse('admin:questions_section_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
 
 
-def test_page_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_page_search(admin_client):
     url = reverse('admin:questions_page_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
 
 
-def test_questionset_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_questionset_search(admin_client):
     url = reverse('admin:questions_questionset_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
 
 
-def test_question_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_question_search(admin_client):
     url = reverse('admin:questions_question_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
diff --git a/rdmo/tasks/tests/test_admin.py b/rdmo/tasks/tests/test_admin.py
index 7bb10a8e11..80705bc7e2 100644
--- a/rdmo/tasks/tests/test_admin.py
+++ b/rdmo/tasks/tests/test_admin.py
@@ -1,9 +1,7 @@
 from django.urls import reverse
 
 
-def test_task_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_task_search(admin_client):
     url = reverse('admin:tasks_task_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200
diff --git a/rdmo/views/tests/test_admin.py b/rdmo/views/tests/test_admin.py
index 31929d1d6e..cfd5be7228 100644
--- a/rdmo/views/tests/test_admin.py
+++ b/rdmo/views/tests/test_admin.py
@@ -1,9 +1,7 @@
 from django.urls import reverse
 
 
-def test_view_search(db, client):
-    client.login(username='admin', password='admin')
-
+def test_view_search(admin_client):
     url = reverse('admin:views_view_changelist') + '?q=test'
-    response = client.get(url)
+    response = admin_client.get(url)
     assert response.status_code == 200