diff --git a/python/examples/conftest.py b/python/examples/conftest.py
deleted file mode 100644
index 48b66463e..000000000
--- a/python/examples/conftest.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from deltachat.testplugin import *  # noqa
diff --git a/python/setup.py b/python/setup.py
index 8c8e63ecc..e2a79e4b1 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -22,6 +22,11 @@ def main():
         packages=setuptools.find_packages('src'),
         package_dir={'': 'src'},
         cffi_modules=['src/deltachat/_build.py:ffibuilder'],
+        entry_points = {
+            'pytest11': [
+                'deltachat.testplugin = deltachat.testplugin',
+            ],
+        },
         classifiers=[
             'Development Status :: 4 - Beta',
             'Intended Audience :: Developers',
diff --git a/python/tests/conftest.py b/python/tests/conftest.py
index 20a0fdd17..2db21033e 100644
--- a/python/tests/conftest.py
+++ b/python/tests/conftest.py
@@ -5,9 +5,6 @@ import pytest
 import py
 
 
-from deltachat.testplugin import *  # noqa
-
-
 @pytest.fixture(scope="session")
 def data():
     class Data:
diff --git a/python/tox.ini b/python/tox.ini
index 45810e40b..1b6f0dbd9 100644
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -7,15 +7,14 @@ envlist =
 
 [testenv]
 commands = 
-    pytest -n6 --reruns 2 --reruns-delay 5 -v -rsXx --ignored {posargs:tests}
-    pytest examples/test_examples.py
-    python tests/package_wheels.py {toxworkdir}/wheelhouse
+    pytest -n6 --reruns 2 --reruns-delay 5 -v -rsXx --ignored {posargs: tests examples}
+    # python tests/package_wheels.py {toxworkdir}/wheelhouse
 passenv = 
     TRAVIS 
     DCC_RS_DEV
     DCC_RS_TARGET
     DCC_PY_LIVECONFIG
-    DCC_NEW_TMP_EMAIL
+    DCC_NEW_TMP_EMAIL 
     CARGO_TARGET_DIR
     RUSTC_WRAPPER
 deps = 
@@ -68,7 +67,6 @@ commands =
 
 [pytest]
 addopts = -v -ra --strict-markers
-python_files = tests/test_*.py
 norecursedirs = .tox 
 xfail_strict=true
 timeout = 90