diff --git a/pytest.ini b/pytest.ini
index 43cb8a7..3851b6d 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -3,3 +3,10 @@ testpaths = tests/
 norecursedirs = .* *.egg *.egg-info env* devenv* docs
 addopts = -m "not abci"
 looponfailroots = planetmint tests
+asyncio_mode = strict
+markers = 
+    userfixtures
+    language
+    tendermint
+    usefixture
+    execute
diff --git a/tests/conftest.py b/tests/conftest.py
index f7327a6..35ef0c1 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -438,7 +438,7 @@ def abci_http(_setup_database, _configure_planetmint, abci_server,
     return False
 
 
-@pytest.yield_fixture(scope='session')
+@pytest.fixture(scope='session')
 def event_loop():
     import asyncio