diff --git a/CHANGES b/CHANGES
index 1294dcecb2f..22fd604d666 100644
--- a/CHANGES
+++ b/CHANGES
@@ -19,6 +19,14 @@ $ pipx install --suffix=@next 'tmuxp' --pip-args '\--pre' --force
 
 - _Insert changes/features/fixes for next release here_
 
+## tmuxp 1.15.2 (unreleased)
+
+**Maintenance release, no features or fixes**
+
+### Packaging
+
+- Move conftest.py to root, to avoid packaging in wheel (#826 vs #825)
+
 ## tmuxp 1.15.1 (2022-09-23)
 
 **Maintenance release, no features or fixes**
diff --git a/src/tmuxp/conftest.py b/conftest.py
similarity index 92%
rename from src/tmuxp/conftest.py
rename to conftest.py
index b753bdd9e84..368f68fdc2b 100644
--- a/src/tmuxp/conftest.py
+++ b/conftest.py
@@ -1,3 +1,8 @@
+"""Conftest.py (root-level)
+
+We keep this in root pytest fixtures in pytest's doctest plugin to be available, as well
+as avoiding conftest.py from being included in the wheel.
+"""
 import logging
 import os
 import pathlib
diff --git a/pyproject.toml b/pyproject.toml
index 43aeae50bf7..a68f19c30ac 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,6 +32,7 @@ include = [
   { path = "tests", format = "sdist" },
   { path = "examples", format = "sdist" },
   { path = "docs", format = "sdist" },
+  { path = "conftest.py", format = "sdist" },
 ]
 
 [tool.poetry.urls]
diff --git a/tests/conftest.py b/tests/conftest.py
deleted file mode 100644
index 44a43177266..00000000000
--- a/tests/conftest.py
+++ /dev/null
@@ -1 +0,0 @@
-from tmuxp.conftest import *  # noqa F40