diff --git a/integration/conftest.py b/integration/conftest.py index 1c75f0792..ca9d55e8c 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -22,8 +22,6 @@ from util import _create_node from util import _run_node -pytest_plugins = 'pytest_twisted' - # pytest customization hooks def pytest_addoption(parser): diff --git a/tox.ini b/tox.ini index 5af689f92..aeb5ee784 100644 --- a/tox.ini +++ b/tox.ini @@ -3,6 +3,9 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox" from this directory. +[pytest] +twisted = 1 + [tox] envlist = py27 minversion = 1.7