diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e94c0777..c1c01871 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,6 +57,5 @@ jobs:
     - name: Setup extension (CKAN >= 2.9)
       run: |
         ckan -c test.ini db init
-        ckan -c test.ini harvester initdb
     - name: Run tests
       run: pytest --ckan-ini=test.ini --cov=ckanext.harvest --disable-warnings ckanext/harvest/tests
diff --git a/ckanext/harvest/tests/conftest.py b/ckanext/harvest/tests/conftest.py
new file mode 100644
index 00000000..26c0443f
--- /dev/null
+++ b/ckanext/harvest/tests/conftest.py
@@ -0,0 +1,6 @@
+import pytest
+
+@pytest.fixture
+def clean_db(reset_db, migrate_db_for):
+    reset_db()
+    migrate_db_for("harvest")
diff --git a/ckanext/harvest/tests/fixtures.py b/ckanext/harvest/tests/fixtures.py
index fb905953..bb283eb4 100644
--- a/ckanext/harvest/tests/fixtures.py
+++ b/ckanext/harvest/tests/fixtures.py
@@ -1,14 +1,8 @@
 import pytest
 
-import ckanext.harvest.model as harvest_model
 from ckanext.harvest import queue
 
 
-@pytest.fixture
-def harvest_setup():
-    harvest_model.setup()
-
-
 @pytest.fixture
 def clean_queues():
     queue.purge_queues()
diff --git a/ckanext/harvest/tests/harvesters/test_base.py b/ckanext/harvest/tests/harvesters/test_base.py
index cffecbd4..f260e444 100644
--- a/ckanext/harvest/tests/harvesters/test_base.py
+++ b/ckanext/harvest/tests/harvesters/test_base.py
@@ -13,7 +13,7 @@
 _ensure_name_is_unique = HarvesterBase._ensure_name_is_unique
 
 
-@pytest.mark.usefixtures('clean_db', 'clean_index', 'harvest_setup')
+@pytest.mark.usefixtures('clean_db', 'clean_index')
 class TestGenNewName(object):
 
     def test_basic(self):
@@ -51,7 +51,7 @@ def test_config_override(self):
         assert HarvesterBase._gen_new_name('Trees', append_type='number-sequence') == 'trees1'
 
 
-@pytest.mark.usefixtures('clean_db', 'clean_index', 'harvest_setup')
+@pytest.mark.usefixtures('clean_db', 'clean_index')
 class TestEnsureNameIsUnique(object):
 
     def test_no_existing_datasets(self):
diff --git a/ckanext/harvest/tests/harvesters/test_ckanharvester.py b/ckanext/harvest/tests/harvesters/test_ckanharvester.py
index b90f2ad8..77957be3 100644
--- a/ckanext/harvest/tests/harvesters/test_ckanharvester.py
+++ b/ckanext/harvest/tests/harvesters/test_ckanharvester.py
@@ -38,7 +38,7 @@ def was_last_job_considered_error_free():
     return bool(HarvesterBase.last_error_free_job(job))
 
 
-@pytest.mark.usefixtures('with_plugins', 'clean_db', 'clean_index', 'harvest_setup')
+@pytest.mark.usefixtures('with_plugins', 'clean_db', 'clean_index')
 class TestCkanHarvester(object):
 
     def test_gather_normal(self):
diff --git a/ckanext/harvest/tests/test_action.py b/ckanext/harvest/tests/test_action.py
index e22bb5cd..fdee17eb 100644
--- a/ckanext/harvest/tests/test_action.py
+++ b/ckanext/harvest/tests/test_action.py
@@ -57,7 +57,7 @@ def import_stage(self, harvest_object):
 }
 
 
-@pytest.mark.usefixtures('with_plugins', 'clean_db', 'harvest_setup', 'clean_queues')
+@pytest.mark.usefixtures('with_plugins', 'clean_db', 'clean_queues')
 @pytest.mark.ckan_config('ckan.plugins', 'harvest test_action_harvester')
 class HarvestSourceActionBase():
 
@@ -225,7 +225,7 @@ def test_patch(self):
         assert source.type == source_dict['source_type']
 
 
-@pytest.mark.usefixtures('with_plugins', 'clean_db', 'harvest_setup', 'clean_queues')
+@pytest.mark.usefixtures('with_plugins', 'clean_db', 'clean_queues')
 @pytest.mark.ckan_config('ckan.plugins', 'harvest test_action_harvester')
 class TestActions():
     def test_harvest_source_clear(self):
diff --git a/ckanext/harvest/tests/test_blueprint.py b/ckanext/harvest/tests/test_blueprint.py
index a9141da8..d82c04d9 100644
--- a/ckanext/harvest/tests/test_blueprint.py
+++ b/ckanext/harvest/tests/test_blueprint.py
@@ -5,7 +5,7 @@
 from ckanext.harvest.tests import factories as harvest_factories
 
 
-@pytest.mark.usefixtures('clean_db', 'clean_index', 'harvest_setup')
+@pytest.mark.usefixtures('clean_db', 'clean_index')
 class TestBlueprint():
 
     def test_index_page_is_rendered(self, app):
diff --git a/ckanext/harvest/tests/test_queue.py b/ckanext/harvest/tests/test_queue.py
index 04332fd5..e711dd8d 100644
--- a/ckanext/harvest/tests/test_queue.py
+++ b/ckanext/harvest/tests/test_queue.py
@@ -88,7 +88,7 @@ def import_stage(self, harvest_object):
         return True
 
 
-@pytest.mark.usefixtures('with_plugins', 'clean_db', 'harvest_setup', 'clean_queues')
+@pytest.mark.usefixtures('with_plugins', 'clean_db', 'clean_queues')
 @pytest.mark.ckan_config('ckan.plugins', 'harvest test_harvester')
 class TestHarvestQueue(object):
 
diff --git a/ckanext/harvest/tests/test_queue2.py b/ckanext/harvest/tests/test_queue2.py
index bf83f7d7..9cc34bf5 100644
--- a/ckanext/harvest/tests/test_queue2.py
+++ b/ckanext/harvest/tests/test_queue2.py
@@ -84,7 +84,7 @@ def import_stage(self, harvest_object):
         return True
 
 
-@pytest.mark.usefixtures('with_plugins', 'clean_db', 'harvest_setup', 'clean_queues')
+@pytest.mark.usefixtures('with_plugins', 'clean_db', 'clean_queues')
 @pytest.mark.ckan_config('ckan.plugins', 'harvest test_harvester2')
 class TestEndStates(object):
 
diff --git a/ckanext/harvest/tests/test_timeouts.py b/ckanext/harvest/tests/test_timeouts.py
index b3953749..17b965a4 100644
--- a/ckanext/harvest/tests/test_timeouts.py
+++ b/ckanext/harvest/tests/test_timeouts.py
@@ -9,7 +9,7 @@
 from ckanext.harvest.logic import HarvestJobExists
 
 
-@pytest.mark.usefixtures('with_plugins', 'clean_db', 'harvest_setup', 'clean_queues')
+@pytest.mark.usefixtures('with_plugins', 'clean_db', 'clean_queues')
 @pytest.mark.ckan_config('ckan.plugins', 'harvest test_action_harvester')
 class TestModelFunctions:
     dataset_counter = 0