diff --git a/tests/test_envvars.py b/tests/test_envvars.py
index bcf477b..997f34a 100644
--- a/tests/test_envvars.py
+++ b/tests/test_envvars.py
@@ -12,6 +12,8 @@ def capture_event(self, event):
 
     def capture_envelope(self, envelope):
         envelopes.append(envelope)
+        if envelope.get_event() is not None:
+            events.append(envelope.get_event())
 
 
 @pytest.fixture(autouse=True)
diff --git a/tests/test_retries.py b/tests/test_retries.py
index cc890de..754a1b3 100644
--- a/tests/test_retries.py
+++ b/tests/test_retries.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import pytest
+import sentry_sdk
 
 from pytest_sentry import Client
 
@@ -9,8 +10,17 @@
 events = []
 
 
+class MyTransport(sentry_sdk.Transport):
+    def capture_event(self, event):
+        events.append(event)
+
+    def capture_envelope(self, envelope):
+        if envelope.get_event() is not None:
+            events.append(envelope.get_event())
+
+
 @pytest.mark.flaky(reruns=2)
-@pytest.mark.sentry_client(Client(transport=events.append, traces_sample_rate=0.0))
+@pytest.mark.sentry_client(Client(transport=MyTransport(), traces_sample_rate=0.0))
 def test_basic(request):
     global i
     i += 1
@@ -18,7 +28,7 @@ def test_basic(request):
         1 / 0
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope="module", autouse=True)
 def assert_report():
     yield
     (event,) = events
diff --git a/tests/test_tracing.py b/tests/test_tracing.py
index 3ad6afe..18db00e 100644
--- a/tests/test_tracing.py
+++ b/tests/test_tracing.py
@@ -27,7 +27,7 @@ def test_basic(foo_fixture):
     assert foo_fixture == 42
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope="module", autouse=True)
 def assert_report():
     yield