diff --git a/.github/workflows/ci-code.yml b/.github/workflows/ci-code.yml
index 0f08f4ec0a..2dff454067 100644
--- a/.github/workflows/ci-code.yml
+++ b/.github/workflows/ci-code.yml
@@ -27,6 +27,10 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.9', '3.12']
+        database-backend: [psql]
+        include:
+        - python-version: '3.9'
+          database-backend: sqlite
 
     services:
       postgres:
@@ -79,7 +83,7 @@ jobs:
       run: |
         ${{ matrix.python-version == '3.9' && 'unset CI' || '' }}
         ${{ matrix.python-version == '3.9' && 'VIRTUAL_ENV=$PWD/.venv' || '' }}
-        pytest -n auto --db-backend psql -m 'not nightly' tests/ ${{ matrix.python-version == '3.9' && '--cov aiida' || '' }}
+        pytest -n auto --db-backend ${{ matrix.database-backend }} -m 'not nightly' tests/ ${{ matrix.python-version == '3.9' && '--cov aiida' || '' }}
 
     - name: Upload coverage report
       if: matrix.python-version == 3.9 && github.repository == 'aiidateam/aiida-core'
@@ -90,7 +94,6 @@ jobs:
         file: ./coverage.xml
         fail_ci_if_error: false  # don't fail job, if coverage upload fails
 
-
   tests-presto:
 
     runs-on: ubuntu-latest
diff --git a/pyproject.toml b/pyproject.toml
index 50141e0bd1..6cca60defd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -387,7 +387,7 @@ minversion = '7.0'
 testpaths = [
   'tests'
 ]
-timeout = 60
+timeout = 240
 xfail_strict = true
 
 [tool.ruff]
diff --git a/tests/cmdline/commands/test_rabbitmq.py b/tests/cmdline/commands/test_rabbitmq.py
index 8bb443cfe2..78d2d7ce73 100644
--- a/tests/cmdline/commands/test_rabbitmq.py
+++ b/tests/cmdline/commands/test_rabbitmq.py
@@ -69,7 +69,7 @@ def test_tasks_revive_without_daemon(run_cli_command):
     assert run_cli_command(cmd_rabbitmq.cmd_tasks_revive, raises=True)
 
 
-@pytest.mark.usefixtures('started_daemon_client')
+@pytest.mark.usefixtures('aiida_profile_clean')
 def test_revive(run_cli_command, monkeypatch, aiida_code_installed, submit_and_await):
     """Test ``tasks revive``."""
     code = aiida_code_installed(default_calc_job_plugin='core.arithmetic.add', filepath_executable='/bin/bash')
diff --git a/tests/tools/archive/orm/test_codes.py b/tests/tools/archive/orm/test_codes.py
index 27ae5f7882..5edc7e2fc7 100644
--- a/tests/tools/archive/orm/test_codes.py
+++ b/tests/tools/archive/orm/test_codes.py
@@ -35,7 +35,7 @@ def test_that_solo_code_is_exported_correctly(aiida_profile, tmp_path, aiida_loc
     assert orm.load_node(code_uuid).label == code_label
 
 
-def test_input_code(aiida_profile, tmp_path, aiida_localhost):
+def test_input_code(aiida_profile_clean, tmp_path, aiida_localhost):
     """This test checks that when a calculation is exported then the
     corresponding code is also exported. It also checks that the links
     are also in place after the import.
@@ -59,7 +59,7 @@ def test_input_code(aiida_profile, tmp_path, aiida_localhost):
     export_file = tmp_path / 'export.aiida'
     create_archive([calc], filename=export_file)
 
-    aiida_profile.reset_storage()
+    aiida_profile_clean.reset_storage()
 
     import_archive(export_file)