diff --git a/swh/core/db/tests/pytest_plugin/__init__.py b/swh/core/db/tests/pytest_plugin/__init__.py
new file mode 100644
diff --git a/swh/core/db/tests/data/0-schema.sql b/swh/core/db/tests/pytest_plugin/data/0-schema.sql
rename from swh/core/db/tests/data/0-schema.sql
rename to swh/core/db/tests/pytest_plugin/data/0-schema.sql
diff --git a/swh/core/db/tests/data/1-data.sql b/swh/core/db/tests/pytest_plugin/data/1-data.sql
rename from swh/core/db/tests/data/1-data.sql
rename to swh/core/db/tests/pytest_plugin/data/1-data.sql
diff --git a/swh/core/db/tests/test_db_utils.py b/swh/core/db/tests/pytest_plugin/test_pytest_plugin.py
rename from swh/core/db/tests/test_db_utils.py
rename to swh/core/db/tests/pytest_plugin/test_pytest_plugin.py