diff --git a/conftest.py b/conftest.py
index 898fb537e..6c279a816 100644
--- a/conftest.py
+++ b/conftest.py
@@ -2,7 +2,7 @@
 import sys
 from os.path import abspath, dirname, join
 
-from tests.fixtures import (elasticapm_client, not_so_random,
+from tests.fixtures import (elasticapm_client, instrument, not_so_random,
                             sending_elasticapm_client, validating_httpserver)
 from tests.utils.compat import middleware_setting
 
diff --git a/tests/fixtures.py b/tests/fixtures.py
index 72772fa66..129aed99c 100644
--- a/tests/fixtures.py
+++ b/tests/fixtures.py
@@ -8,6 +8,7 @@
 from pytest_localserver.http import ContentServer
 from werkzeug.wrappers import Request, Response
 
+import elasticapm
 from elasticapm.base import Client
 
 ERRORS_SCHEMA = 'https://raw.githubusercontent.com/elastic/apm-server/master/docs/spec/errors/payload.json'
@@ -117,3 +118,10 @@ def not_so_random():
     random.seed(42)
     yield
     random.setstate(old_state)
+
+
+@pytest.fixture()
+def instrument():
+    elasticapm.instrument()
+    yield
+    elasticapm.uninstrument()
diff --git a/tests/instrumentation/botocore_tests.py b/tests/instrumentation/botocore_tests.py
index fce568927..9a899694e 100644
--- a/tests/instrumentation/botocore_tests.py
+++ b/tests/instrumentation/botocore_tests.py
@@ -5,7 +5,7 @@
 
 
 @mock.patch("botocore.endpoint.Endpoint.make_request")
-def test_botocore_instrumentation(mock_make_request, elasticapm_client):
+def test_botocore_instrumentation(mock_make_request, elasticapm_client, instrument):
     mock_response = mock.Mock()
     mock_response.status_code = 200
     mock_make_request.return_value = (mock_response, {})
@@ -26,7 +26,7 @@ def test_botocore_instrumentation(mock_make_request, elasticapm_client):
 
 
 
-def test_nonstandard_endpoint_url(elasticapm_client):
+def test_nonstandard_endpoint_url(instrument, elasticapm_client):
     instrument = BotocoreInstrumentation()
     elasticapm_client.begin_transaction('test')
     module, method = BotocoreInstrumentation.instrument_list[0]
diff --git a/tests/instrumentation/django_tests/template_tests.py b/tests/instrumentation/django_tests/template_tests.py
index 29b17eca6..f355955d5 100644
--- a/tests/instrumentation/django_tests/template_tests.py
+++ b/tests/instrumentation/django_tests/template_tests.py
@@ -38,7 +38,7 @@
 
 
 @mock.patch("elasticapm.traces.TransactionsStore.should_collect")
-def test_template_rendering(should_collect, django_elasticapm_client, client):
+def test_template_rendering(should_collect, instrument, django_elasticapm_client, client):
     should_collect.return_value = False
     with override_settings(**middleware_setting(django.VERSION,
                                             ['elasticapm.contrib.django.middleware.TracingMiddleware'])):
@@ -67,7 +67,7 @@ def test_template_rendering(should_collect, django_elasticapm_client, client):
 @pytest.mark.skipif(django.VERSION < (1, 8),
                     reason='Jinja2 support introduced with Django 1.8')
 @mock.patch("elasticapm.traces.TransactionsStore.should_collect")
-def test_template_rendering_django18_jinja2(should_collect, django_elasticapm_client, client):
+def test_template_rendering_django18_jinja2(should_collect, instrument, django_elasticapm_client, client):
     should_collect.return_value = False
     with override_settings(
             TEMPLATES=TEMPLATES,
diff --git a/tests/instrumentation/jinja2_tests/jinja2_tests.py b/tests/instrumentation/jinja2_tests/jinja2_tests.py
index 37cc0a2a5..b2785a70f 100644
--- a/tests/instrumentation/jinja2_tests/jinja2_tests.py
+++ b/tests/instrumentation/jinja2_tests/jinja2_tests.py
@@ -14,7 +14,7 @@ def jinja_env():
 
 
 @mock.patch("elasticapm.traces.TransactionsStore.should_collect")
-def test_from_file(should_collect, jinja_env, elasticapm_client):
+def test_from_file(should_collect, instrument, jinja_env, elasticapm_client):
     should_collect.return_value = False
     elasticapm_client.begin_transaction("transaction.test")
     template = jinja_env.get_template('mytemplate.html')
@@ -32,7 +32,7 @@ def test_from_file(should_collect, jinja_env, elasticapm_client):
     assert spans[0]['type'] == 'template.jinja2'
 
 
-def test_from_string(elasticapm_client):
+def test_from_string(instrument, elasticapm_client):
     elasticapm_client.begin_transaction("transaction.test")
     template = Template("<html></html")
     template.render()
diff --git a/tests/instrumentation/psycopg2_tests.py b/tests/instrumentation/psycopg2_tests.py
index 0de151c91..8d40e6b8c 100644
--- a/tests/instrumentation/psycopg2_tests.py
+++ b/tests/instrumentation/psycopg2_tests.py
@@ -217,8 +217,6 @@ def test_multi_statement_sql():
 def test_psycopg2_register_type(postgres_connection, elasticapm_client):
     import psycopg2.extras
 
-    control.instrument()
-
     try:
         elasticapm_client.begin_transaction("web.django")
         new_type = psycopg2.extras.register_uuid(None, postgres_connection)
@@ -237,8 +235,6 @@ def test_psycopg2_register_json(postgres_connection, elasticapm_client):
     # separately
     import psycopg2.extras
 
-    control.instrument()
-
     try:
         elasticapm_client.begin_transaction("web.django")
         # as arg
@@ -257,8 +253,7 @@ def test_psycopg2_register_json(postgres_connection, elasticapm_client):
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(not has_postgres_configured, reason="PostgresSQL not configured")
-def test_psycopg2_tracing_outside_of_elasticapm_transaction(postgres_connection, elasticapm_client):
-    control.instrument()
+def test_psycopg2_tracing_outside_of_elasticapm_transaction(instrument, postgres_connection, elasticapm_client):
     cursor = postgres_connection.cursor()
     # check that the cursor is a proxy, even though we're not in an elasticapm
     # transaction
@@ -270,12 +265,11 @@ def test_psycopg2_tracing_outside_of_elasticapm_transaction(postgres_connection,
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(not has_postgres_configured, reason="PostgresSQL not configured")
-def test_psycopg2_select_LIKE(postgres_connection, elasticapm_client):
+def test_psycopg2_select_LIKE(instrument, postgres_connection, elasticapm_client):
     """
     Check that we pass queries with %-notation but without parameters
     properly to the dbapi backend
     """
-    control.instrument()
     cursor = postgres_connection.cursor()
     query = "SELECT * FROM test WHERE name LIKE 't%'"
 
@@ -298,11 +292,10 @@ def test_psycopg2_select_LIKE(postgres_connection, elasticapm_client):
 @pytest.mark.integrationtest
 @pytest.mark.skipif(not has_postgres_configured, reason="PostgresSQL not configured")
 @pytest.mark.skipif(not has_sql_module, reason="psycopg2.sql module missing")
-def test_psycopg2_composable_query_works(postgres_connection, elasticapm_client):
+def test_psycopg2_composable_query_works(instrument, postgres_connection, elasticapm_client):
     """
     Check that we parse queries that are psycopg2.sql.Composable correctly
     """
-    control.instrument()
     cursor = postgres_connection.cursor()
     query = sql.SQL("SELECT * FROM {table} WHERE {row} LIKE 't%' ORDER BY {row} DESC").format(
         table=sql.Identifier('test'),
diff --git a/tests/instrumentation/pymongo_tests.py b/tests/instrumentation/pymongo_tests.py
index de9a78bae..a34b45b51 100644
--- a/tests/instrumentation/pymongo_tests.py
+++ b/tests/instrumentation/pymongo_tests.py
@@ -20,7 +20,7 @@ def mongo_database():
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(pymongo.version_tuple < (3, 0), reason='New in 3.0')
-def test_collection_bulk_write(elasticapm_client, mongo_database):
+def test_collection_bulk_write(instrument, elasticapm_client, mongo_database):
     elasticapm_client.begin_transaction('transaction.test')
     requests = [pymongo.InsertOne({'x': 1}),
                 pymongo.DeleteOne({'x': 1}),
@@ -37,7 +37,7 @@ def test_collection_bulk_write(elasticapm_client, mongo_database):
 
 
 @pytest.mark.integrationtest
-def test_collection_count(elasticapm_client, mongo_database):
+def test_collection_count(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     mongo_database.blogposts.insert(blogpost)
@@ -54,7 +54,7 @@ def test_collection_count(elasticapm_client, mongo_database):
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(pymongo.version_tuple < (3, 0), reason='New in 3.0')
-def test_collection_delete_one(elasticapm_client, mongo_database):
+def test_collection_delete_one(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     mongo_database.blogposts.insert_one(blogpost)
@@ -70,7 +70,7 @@ def test_collection_delete_one(elasticapm_client, mongo_database):
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(pymongo.version_tuple < (3, 0), reason='New in 3.0')
-def test_collection_delete_many(elasticapm_client, mongo_database):
+def test_collection_delete_many(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     mongo_database.blogposts.insert_one(blogpost)
@@ -85,7 +85,7 @@ def test_collection_delete_many(elasticapm_client, mongo_database):
 
 
 @pytest.mark.integrationtest
-def test_collection_insert(elasticapm_client, mongo_database):
+def test_collection_insert(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     elasticapm_client.begin_transaction('transaction.test')
@@ -100,7 +100,7 @@ def test_collection_insert(elasticapm_client, mongo_database):
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(pymongo.version_tuple < (3, 0), reason='New in 3.0')
-def test_collection_insert_one(elasticapm_client, mongo_database):
+def test_collection_insert_one(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     elasticapm_client.begin_transaction('transaction.test')
@@ -115,7 +115,7 @@ def test_collection_insert_one(elasticapm_client, mongo_database):
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(pymongo.version_tuple < (3, 0), reason='New in 3.0')
-def test_collection_insert_many(elasticapm_client, mongo_database):
+def test_collection_insert_many(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     elasticapm_client.begin_transaction('transaction.test')
@@ -130,7 +130,7 @@ def test_collection_insert_many(elasticapm_client, mongo_database):
 
 
 @pytest.mark.integrationtest
-def test_collection_find(elasticapm_client, mongo_database):
+def test_collection_find(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     blogposts = []
@@ -151,7 +151,7 @@ def test_collection_find(elasticapm_client, mongo_database):
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(pymongo.version_tuple < (3, 0), reason='New in 3.0')
-def test_collection_find_one(elasticapm_client, mongo_database):
+def test_collection_find_one(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     r = mongo_database.blogposts.insert_one(blogpost)
@@ -166,7 +166,7 @@ def test_collection_find_one(elasticapm_client, mongo_database):
 
 
 @pytest.mark.integrationtest
-def test_collection_remove(elasticapm_client, mongo_database):
+def test_collection_remove(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     r = mongo_database.blogposts.insert(blogpost)
@@ -181,7 +181,7 @@ def test_collection_remove(elasticapm_client, mongo_database):
 
 
 @pytest.mark.integrationtest
-def test_collection_update(elasticapm_client, mongo_database):
+def test_collection_update(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     r = mongo_database.blogposts.insert(blogpost)
@@ -198,7 +198,7 @@ def test_collection_update(elasticapm_client, mongo_database):
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(pymongo.version_tuple < (3, 0), reason='New in 3.0')
-def test_collection_update_one(elasticapm_client, mongo_database):
+def test_collection_update_one(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     r = mongo_database.blogposts.insert(blogpost)
@@ -215,7 +215,7 @@ def test_collection_update_one(elasticapm_client, mongo_database):
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(pymongo.version_tuple < (3, 0), reason='New in 3.0')
-def test_collection_update_many(elasticapm_client, mongo_database):
+def test_collection_update_many(instrument, elasticapm_client, mongo_database):
     blogpost = {'author': 'Tom', 'text': 'Foo',
                 'date': datetime.datetime.utcnow()}
     r = mongo_database.blogposts.insert(blogpost)
@@ -232,7 +232,7 @@ def test_collection_update_many(elasticapm_client, mongo_database):
 
 @pytest.mark.integrationtest
 @pytest.mark.skipif(pymongo.version_tuple < (2, 7), reason='New in 2.7')
-def test_bulk_execute(elasticapm_client, mongo_database):
+def test_bulk_execute(instrument, elasticapm_client, mongo_database):
     elasticapm_client.begin_transaction('transaction.test')
     bulk = mongo_database.test_bulk.initialize_ordered_bulk_op()
     bulk.insert({'x': 'y'})
diff --git a/tests/instrumentation/python_memcached_tests.py b/tests/instrumentation/python_memcached_tests.py
index 10e624891..3b082914d 100644
--- a/tests/instrumentation/python_memcached_tests.py
+++ b/tests/instrumentation/python_memcached_tests.py
@@ -7,7 +7,7 @@
 
 
 @pytest.mark.integrationtest
-def test_memcached(elasticapm_client):
+def test_memcached(instrument, elasticapm_client):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_memcached", "test"):
         host = os.environ.get('MEMCACHED_HOST', 'localhost')
diff --git a/tests/instrumentation/redis_tests.py b/tests/instrumentation/redis_tests.py
index 4fcc56ddb..30e83d997 100644
--- a/tests/instrumentation/redis_tests.py
+++ b/tests/instrumentation/redis_tests.py
@@ -1,7 +1,6 @@
 import os
 from functools import partial
 
-import mock
 import pytest
 import redis
 from redis.client import StrictRedis
@@ -21,7 +20,7 @@ def redis_conn():
 
 
 @pytest.mark.integrationtest
-def test_pipeline(elasticapm_client, redis_conn):
+def test_pipeline(instrument, elasticapm_client, redis_conn):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_pipeline", "test"):
         pipeline = redis_conn.pipeline()
@@ -47,7 +46,7 @@ def test_pipeline(elasticapm_client, redis_conn):
 
 
 @pytest.mark.integrationtest
-def test_rq_patches_redis(elasticapm_client, redis_conn):
+def test_rq_patches_redis(instrument, elasticapm_client, redis_conn):
     # Let's go ahead and change how something important works
     redis_conn._pipeline = partial(StrictRedis.pipeline, redis_conn)
 
@@ -77,7 +76,7 @@ def test_rq_patches_redis(elasticapm_client, redis_conn):
 
 
 @pytest.mark.integrationtest
-def test_redis_client(elasticapm_client, redis_conn):
+def test_redis_client(instrument, elasticapm_client, redis_conn):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_redis_client", "test"):
         redis_conn.rpush("mykey", "a", "b")
diff --git a/tests/instrumentation/requests_tests.py b/tests/instrumentation/requests_tests.py
index 47f45b8aa..f9ac356ab 100644
--- a/tests/instrumentation/requests_tests.py
+++ b/tests/instrumentation/requests_tests.py
@@ -13,7 +13,7 @@
 responses.add('GET', '/', status=200, adding_headers={'Location': 'http://example.com/foo'})
 
 
-def test_requests_instrumentation(elasticapm_client):
+def test_requests_instrumentation(instrument, elasticapm_client):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_request", "test"):
         # NOTE: The `allow_redirects` argument has to be set to `False`,
@@ -30,7 +30,7 @@ def test_requests_instrumentation(elasticapm_client):
     assert 'http://example.com/' == spans[0]['context']['url']
 
 
-def test_requests_instrumentation_via_session(elasticapm_client):
+def test_requests_instrumentation_via_session(instrument, elasticapm_client):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_request", "test"):
         s = requests.Session()
@@ -43,7 +43,7 @@ def test_requests_instrumentation_via_session(elasticapm_client):
     assert 'http://example.com/' == spans[0]['context']['url']
 
 
-def test_requests_instrumentation_via_prepared_request(elasticapm_client):
+def test_requests_instrumentation_via_prepared_request(instrument, elasticapm_client):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_request", "test"):
         r = requests.Request('get', 'http://example.com')
@@ -58,21 +58,21 @@ def test_requests_instrumentation_via_prepared_request(elasticapm_client):
     assert 'http://example.com/' == spans[0]['context']['url']
 
 
-def test_requests_instrumentation_malformed_none(elasticapm_client):
+def test_requests_instrumentation_malformed_none(instrument, elasticapm_client):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_request", "test"):
         with pytest.raises(MissingSchema):
             requests.get(None)
 
 
-def test_requests_instrumentation_malformed_schema(elasticapm_client):
+def test_requests_instrumentation_malformed_schema(instrument, elasticapm_client):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_request", "test"):
         with pytest.raises(MissingSchema):
             requests.get('')
 
 
-def test_requests_instrumentation_malformed_path(elasticapm_client):
+def test_requests_instrumentation_malformed_path(instrument, elasticapm_client):
     elasticapm_client.begin_transaction("transaction.test")
     with capture_span("test_request", "test"):
         with pytest.raises(InvalidURL):
diff --git a/tests/instrumentation/sqlite_tests.py b/tests/instrumentation/sqlite_tests.py
index 8de4dead3..b6eea9334 100644
--- a/tests/instrumentation/sqlite_tests.py
+++ b/tests/instrumentation/sqlite_tests.py
@@ -1,7 +1,7 @@
 import sqlite3
 
 
-def test_connect(elasticapm_client):
+def test_connect(instrument, elasticapm_client):
     elasticapm_client.begin_transaction("transaction.test")
 
     conn = sqlite3.connect(":memory:")
diff --git a/tests/instrumentation/urllib3_tests.py b/tests/instrumentation/urllib3_tests.py
index 0215e39cd..b3584599e 100644
--- a/tests/instrumentation/urllib3_tests.py
+++ b/tests/instrumentation/urllib3_tests.py
@@ -6,7 +6,7 @@
 
 
 @mock.patch("elasticapm.traces.TransactionsStore.should_collect")
-def test_urllib3(should_collect, elasticapm_client, httpserver):
+def test_urllib3(should_collect, instrument, elasticapm_client, httpserver):
     should_collect.return_value = False
     httpserver.serve_content('')
     url = httpserver.url + '/hello_world'