diff --git a/tests/otlp_fixture.py b/tests/otlp_fixture.py
index 633296facd..944ff82040 100644
--- a/tests/otlp_fixture.py
+++ b/tests/otlp_fixture.py
@@ -51,8 +51,12 @@ class OTLPFixture(fixtures.Fixture):
 
     def _setUp(self):
         self.server.start()
+        self.addCleanup(self._cleanup)
 
     def _cleanup(self):
-        self.server.stop()
+        self.server.stop(None)
         self.server.wait_for_termination()
         self.executor.shutdown()
+        # Reset global tracer provider
+        trace._TRACER_PROVIDER_SET_ONCE = trace.Once()
+        trace._TRACER_PROVIDER = None