diff --git a/datadog_lambda/cold_start.py b/datadog_lambda/cold_start.py
index 8c21420d..ea10ea20 100644
--- a/datadog_lambda/cold_start.py
+++ b/datadog_lambda/cold_start.py
@@ -31,7 +31,7 @@ def set_cold_start(init_timestamp_ns):
         _cold_start = False
         _proactive_initialization = False
     _lambda_container_initialized = True
-    from ddtrace import tracer as _tracer
+    from ddtrace.trace import tracer as _tracer
 
 
 def is_cold_start():
diff --git a/datadog_lambda/tracing.py b/datadog_lambda/tracing.py
index c90baff1..973cb562 100644
--- a/datadog_lambda/tracing.py
+++ b/datadog_lambda/tracing.py
@@ -30,10 +30,10 @@
     parse_xray_header,
 )
 
-from ddtrace import tracer, patch, Span
+from ddtrace import patch
 from ddtrace import __version__ as ddtrace_version
 from ddtrace.propagation.http import HTTPPropagator
-from ddtrace.context import Context
+from ddtrace.trace import Context, Span, tracer
 from datadog_lambda import __version__ as datadog_lambda_version
 from datadog_lambda.trigger import (
     _EventSource,
diff --git a/tests/test_benchmarks.py b/tests/test_benchmarks.py
index 899e3d7f..48598cb3 100644
--- a/tests/test_benchmarks.py
+++ b/tests/test_benchmarks.py
@@ -38,7 +38,7 @@ def test_metric_write_metric_point_to_stdout(benchmark, monkeypatch):
 def test_tag_object_tag_object(event, benchmark):
     with open(f"{event_samples_dir}/{event}.json") as f:
         event = json.load(f)
-    span = ddtrace.tracer.start_span("test")
+    span = ddtrace.trace.tracer.start_span("test")
     benchmark(tag_object.tag_object, span, "function.request", event)
 
 
diff --git a/tests/test_tracing.py b/tests/test_tracing.py
index f7d54542..89a7712c 100644
--- a/tests/test_tracing.py
+++ b/tests/test_tracing.py
@@ -10,8 +10,7 @@
 
 import ddtrace
 
-from ddtrace import tracer
-from ddtrace.context import Context
+from ddtrace.trace import Context, tracer
 from ddtrace._trace._span_pointer import _SpanPointer
 from ddtrace._trace._span_pointer import _SpanPointerDirection
 from ddtrace._trace._span_pointer import _SpanPointerDescription
@@ -2158,7 +2157,7 @@ def __init__(self, service, start, span_type, parent_name=None, tags=None):
 
 
 @pytest.mark.parametrize("source,expect", _test_create_inferred_span)
-@patch("ddtrace.Span.finish", autospec=True)
+@patch("ddtrace.trace.Span.finish", autospec=True)
 def test_create_inferred_span(mock_span_finish, source, expect):
     with open(f"{event_samples}{source}.json") as f:
         event = json.load(f)
@@ -2197,7 +2196,7 @@ def test_mark_trace_as_error_for_5xx_responses_getting_400_response_code(
     def test_mark_trace_as_error_for_5xx_responses_sends_error_metric_and_set_error_tags(
         self, mock_submit_errors_metric
     ):
-        mock_span = Mock(ddtrace.Span)
+        mock_span = Mock(ddtrace.trace.Span)
         status_code = "500"
         mark_trace_as_error_for_5xx_responses(
             context="fake_context", status_code=status_code, span=mock_span
diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py
index db9f0f9e..f47285e6 100644
--- a/tests/test_wrapper.py
+++ b/tests/test_wrapper.py
@@ -10,7 +10,7 @@
 import datadog_lambda.xray as xray
 from datadog_lambda.metric import lambda_metric
 from datadog_lambda.thread_stats_writer import ThreadStatsWriter
-from ddtrace import Span, tracer
+from ddtrace.trace import Span, tracer
 from ddtrace.internal.constants import MAX_UINT_64BITS
 
 from tests.utils import get_mock_context, reset_xray_connection