diff --git a/CHANGELOG.md b/CHANGELOG.md
index 286464ab8a..748498b12e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ to [Semantic Versioning]. The full commit history is available in the [commit lo
 #### Added
 
 - Add support for rapids-singlecell, {pr}`3811`.
+- Add scvi-tools MCP package that gives any MCP-compatible LLM access to scvi-tools knowledge
 
 #### Fixed
 
diff --git a/conftest.py b/conftest.py
new file mode 100644
index 0000000000..dd1c0a6c1b
--- /dev/null
+++ b/conftest.py
@@ -0,0 +1,68 @@
+def pytest_addoption(parser):
+    """Register custom CLI options for the test suite."""
+    parser.addoption(
+        "--internet-tests",
+        action="store_true",
+        default=False,
+        help="Run tests that retrieve stuff from the internet. This increases test time.",
+    )
+    parser.addoption(
+        "--multigpu-tests",
+        action="store_true",
+        default=False,
+        help="Run tests that are designed for multiGPU.",
+    )
+    parser.addoption(
+        "--autotune-tests",
+        action="store_true",
+        default=False,
+        help="Run tests that are designed for Ray Autotune.",
+    )
+    parser.addoption(
+        "--mlflow-tests",
+        action="store_true",
+        default=False,
+        help="Run tests that are designed for MLFlow.",
+    )
+    parser.addoption(
+        "--custom-dataloader-tests",
+        action="store_true",
+        default=False,
+        help="Run tests that deal with custom dataloaders. This increases test time.",
+    )
+    parser.addoption(
+        "--optional",
+        action="store_true",
+        default=False,
+        help="Run tests that are optional.",
+    )
+    parser.addoption(
+        "--jax",
+        action="store_true",
+        default=False,
+        help="Run tests that are Jax adopted.",
+    )
+    parser.addoption(
+        "--accelerator",
+        action="store",
+        default="cpu",
+        help="Option to specify which accelerator to use for tests.",
+    )
+    parser.addoption(
+        "--devices",
+        action="store",
+        default="auto",
+        help="Option to specify which devices to use for tests.",
+    )
+    parser.addoption(
+        "--seed",
+        action="store",
+        default=0,
+        help="Option to specify which scvi-tools seed to use for tests.",
+    )
+    parser.addoption(
+        "--private",
+        action="store_true",
+        default=False,
+        help="Run tests that are private.",
+    )
diff --git a/tests/conftest.py b/tests/conftest.py
index f530fff417..c6f3a37593 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,76 +6,6 @@
 from tests.data.utils import generic_setup_adata_manager
 
 
-def pytest_addoption(parser):
-    """Docstring for pytest_addoption."""
-    parser.addoption(
-        "--internet-tests",
-        action="store_true",
-        default=False,
-        help="Run tests that retrieve stuff from the internet. This increases test time.",
-    )
-    parser.addoption(
-        "--multigpu-tests",
-        action="store_true",
-        default=False,
-        help="Run tests that are designed for multiGPU.",
-    )
-    parser.addoption(
-        "--autotune-tests",
-        action="store_true",
-        default=False,
-        help="Run tests that are designed for Ray Autotune.",
-    )
-    parser.addoption(
-        "--mlflow-tests",
-        action="store_true",
-        default=False,
-        help="Run tests that are designed for MLFlow.",
-    )
-    parser.addoption(
-        "--custom-dataloader-tests",
-        action="store_true",
-        default=False,
-        help="Run tests that deals with custom dataloaders. This increases test time.",
-    )
-    parser.addoption(
-        "--optional",
-        action="store_true",
-        default=False,
-        help="Run tests that are optional.",
-    )
-    parser.addoption(
-        "--jax",
-        action="store_true",
-        default=False,
-        help="Run tests that are Jax adopted.",
-    )
-    parser.addoption(
-        "--accelerator",
-        action="store",
-        default="cpu",
-        help="Option to specify which accelerator to use for tests.",
-    )
-    parser.addoption(
-        "--devices",
-        action="store",
-        default="auto",
-        help="Option to specify which devices to use for tests.",
-    )
-    parser.addoption(
-        "--seed",
-        action="store",
-        default=0,
-        help="Option to specify which scvi-tools seed to use for tests.",
-    )
-    parser.addoption(
-        "--private",
-        action="store_true",
-        default=False,
-        help="Run tests that are private.",
-    )
-
-
 def pytest_configure(config):
     """Docstring for pytest_configure."""
     config.addinivalue_line("markers", "optional: mark test as optional.")