diff --git a/PyRIGS/tests/test_unit.py b/PyRIGS/tests/test_unit.py
index 2ddd93ee..9b78d725 100644
--- a/PyRIGS/tests/test_unit.py
+++ b/PyRIGS/tests/test_unit.py
@@ -34,11 +34,13 @@ def get_request_url(url):
         print("Couldn't test url " + pattern)
 
 
-@pytest.fixture(scope='function', autouse=True)
-def run_sample_data(transactional_db, settings, django_db_blocker):  # We need stuff setup so we don't get 404 errors everywhere
-    settings.DEBUG = True
-    call_command('generateSampleUserData')
-    call_command('generateSampleAssetsData')
+@pytest.fixture(scope='class', autouse=True)
+def run_sample_data(django_db_blocker):  # We need stuff setup so we don't get 404 errors everywhere
+    with django_db_blocker.unblock():
+        from django.conf import settings
+        settings.DEBUG = True
+        call_command('generateSampleData')
+        settings.DEBUG = False
 
 
 def test_unauthenticated(client):  # Nothing should be available to the unauthenticated
diff --git a/assets/tests/test_access.py b/assets/tests/test_access.py
index 0eee1016..8fd7300c 100644
--- a/assets/tests/test_access.py
+++ b/assets/tests/test_access.py
@@ -15,7 +15,7 @@ from django.utils import timezone
 
 
 @pytest.fixture(scope='class', autouse=True)
-def run_sample_data(settings, django_db_blocker):  # We need stuff setup so we don't get 404 errors everywhere
+def run_sample_data(django_db_blocker):  # We need stuff setup so we don't get 404 errors everywhere
     with django_db_blocker.unblock():
         from django.conf import settings
         settings.DEBUG = True
@@ -26,6 +26,7 @@ def run_sample_data(settings, django_db_blocker):  # We need stuff setup so we d
 
 class TestAccess():
     def test_basic_access(client):
+        client.logout()
         assert client.login(username="basic", password="basic")
 
         url = reverse('asset_list')
@@ -55,6 +56,7 @@ class TestAccess():
 
 
     def test_keyholder_access(client):
+        client.logout()
         assert client.login(username="keyholder", password="keyholder")
 
         url = reverse('asset_list')