diff --git a/surfsense_backend/pyproject.toml b/surfsense_backend/pyproject.toml
index 9dcb12485..5cf5d4b8c 100644
--- a/surfsense_backend/pyproject.toml
+++ b/surfsense_backend/pyproject.toml
@@ -171,7 +171,12 @@ testpaths = ["tests"]
 python_files = ["test_*.py"]
 python_classes = ["Test*"]
 python_functions = ["test_*"]
-addopts = "-v --tb=short -x --durations=10"
+addopts = "-v --tb=short -x --strict-markers -ra --durations=10"
+markers = [
+    "document: document upload and processing tests",
+    "connector: connector indexing tests",
+    "chat: chat and agent tests",
+]
 
 [tool.setuptools.packages.find]
 where = ["."]
diff --git a/surfsense_backend/tests/e2e/test_document_upload.py b/surfsense_backend/tests/e2e/test_document_upload.py
index 08dc3bd6e..e55db804d 100644
--- a/surfsense_backend/tests/e2e/test_document_upload.py
+++ b/surfsense_backend/tests/e2e/test_document_upload.py
@@ -17,6 +17,7 @@ import shutil
 from pathlib import Path
 
 import httpx
+import pytest
 
 from tests.utils.helpers import (
     FIXTURES_DIR,
@@ -27,6 +28,8 @@ from tests.utils.helpers import (
     upload_multiple_files,
 )
 
+pytestmark = pytest.mark.document
+
 # ---------------------------------------------------------------------------
 # Helpers local to this module
 # ---------------------------------------------------------------------------