diff --git a/tests/conftest.py b/tests/conftest.py
index 3c9602d..3fa364f 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,4 +1,5 @@
 import os
+from typing import Generator
 import pytest
 from opengeodeweb_microservice.database.connection import init_database, get_session
 from opengeodeweb_microservice.database.data import Data
@@ -8,13 +9,13 @@
 
 
 @pytest.fixture(scope="session", autouse=True)
-def setup_database():
+def setup_database() -> Generator[None, None, None]:
     init_database(DB_PATH)
     yield
     _cleanup_database(DB_PATH)
 
 
-def _cleanup_database(db_path: str):
+def _cleanup_database(db_path: str) -> None:
     try:
         session = get_session()
         session.close()
@@ -29,7 +30,7 @@ def _cleanup_database(db_path: str):
 
 
 @pytest.fixture(autouse=True)
-def clean_database():
+def clean_database() -> Generator[None, None, None]:
     with get_session() as session:
         session = get_session()
         session.query(Data).delete()
diff --git a/tests/test_database.py b/tests/test_database.py
index e7a1898..1105d8d 100644
--- a/tests/test_database.py
+++ b/tests/test_database.py
@@ -1,7 +1,7 @@
 from opengeodeweb_microservice.database.data import Data
 
 
-def test_data_crud_operations(clean_database):
+def test_data_crud_operations(clean_database: None) -> None:
     data = Data.create(
         geode_object="test_object",
         viewer_object="test_viewer",
@@ -22,7 +22,7 @@ def test_data_crud_operations(clean_database):
     assert non_existent is None
 
 
-def test_data_with_additional_files(clean_database):
+def test_data_with_additional_files(clean_database: None) -> None:
     files = ["file1.txt", "file2.txt"]
     data = Data.create(
         geode_object="test_files",