diff --git a/apollo-router/src/plugins/connectors/snapshots/apollo_router__plugins__connectors__tests__tracing_connect_span.snap b/apollo-router/src/plugins/connectors/snapshots/apollo_router__plugins__connectors__tests__tracing_connect_span.snap
deleted file mode 100644
index 4fc985cf8d..0000000000
--- a/apollo-router/src/plugins/connectors/snapshots/apollo_router__plugins__connectors__tests__tracing_connect_span.snap
+++ /dev/null
@@ -1,79 +0,0 @@
----
-source: apollo-router/src/plugins/connectors/tests.rs
-expression: span
----
-{
-  "name": "apollo_router::plugins::connectors::tests::root",
-  "record": {
-    "entries": [],
-    "metadata": {
-      "name": "root",
-      "target": "apollo_router::plugins::connectors::tests",
-      "level": "ERROR",
-      "module_path": "apollo_router::plugins::connectors::tests",
-      "fields": {
-        "names": []
-      }
-    }
-  },
-  "children": {
-    "apollo_router::services::connector_service::connect": {
-      "name": "apollo_router::services::connector_service::connect",
-      "record": {
-        "entries": [
-          [
-            "otel.kind",
-            "INTERNAL"
-          ],
-          [
-            "apollo.connector.type",
-            "http"
-          ],
-          [
-            "apollo.connector.field.name",
-            "users"
-          ],
-          [
-            "apollo.connector.selection",
-            "{\n  id\n  name\n}"
-          ],
-          [
-            "apollo_private.sent_time_offset",
-            "[sent_time_offset_redacted]"
-          ],
-          [
-            "apollo.connector.detail",
-            "{\"GET\":\"/users\"}"
-          ],
-          [
-            "apollo.connector.source.name",
-            "json"
-          ],
-          [
-            "apollo.connector.source.detail",
-            "[source_detail_redacted]"
-          ]
-        ],
-        "metadata": {
-          "name": "connect",
-          "target": "apollo_router::services::connector_service",
-          "level": "INFO",
-          "module_path": "apollo_router::services::connector_service",
-          "fields": {
-            "names": [
-              "otel.kind",
-              "apollo.connector.type",
-              "apollo.connector.detail",
-              "apollo.connector.field.name",
-              "apollo.connector.selection",
-              "apollo.connector.source.name",
-              "apollo.connector.source.detail",
-              "apollo_private.sent_time_offset"
-            ]
-          }
-        }
-      },
-      "children": {}
-    }
-  }
-}
diff --git a/apollo-router/src/plugins/connectors/tests.rs b/apollo-router/src/plugins/connectors/tests.rs
index 4ef49186b3..76f1c0cec1 100644
--- a/apollo-router/src/plugins/connectors/tests.rs
+++ b/apollo-router/src/plugins/connectors/tests.rs
@@ -6,13 +6,16 @@ use http::header::CONTENT_TYPE;
 use itertools::EitherOrBoth;
 use itertools::Itertools;
 use mime::APPLICATION_JSON;
+use mockall::mock;
+use mockall::predicate::eq;
 use req_asserts::Matcher;
 use serde_json_bytes::json;
-use test_span::get_spans_for_root;
-use test_span::prelude::test_span;
-use test_span::Filter;
 use tower::ServiceExt;
-use tracing_core::Level;
+use tracing_core::span::Attributes;
+use tracing_core::span::Id;
+use tracing_core::span::Record;
+use tracing_core::Event;
+use tracing_core::Metadata;
 use wiremock::http::HeaderName;
 use wiremock::http::HeaderValue;
 use wiremock::matchers::body_json;
@@ -23,6 +26,7 @@ use wiremock::MockServer;
 use wiremock::ResponseTemplate;
 
 use crate::json_ext::ValueExt;
+use crate::plugins::connectors::tracing::CONNECT_SPAN_NAME;
 use crate::router_factory::RouterSuperServiceFactory;
 use crate::router_factory::YamlRouterFactory;
 use crate::services::new_service::ServiceFactory;
@@ -475,42 +479,78 @@ async fn test_headers() {
     );
 }
 
-#[test_span(tokio::test)]
+mock! {
+    Subscriber {}
+    impl tracing_core::Subscriber for Subscriber {
+        fn enabled<'a>(&self, metadata: &Metadata<'a>) -> bool;
+        fn new_span<'a>(&self, span: &Attributes<'a>) -> Id;
+        fn record<'a>(&self, span: &Id, values: &Record<'a>);
+        fn record_follows_from(&self, span: &Id, follows: &Id);
+        fn event_enabled<'a>(&self, event: &Event<'a>) -> bool;
+        fn event<'a>(&self, event: &Event<'a>);
+        fn enter(&self, span: &Id);
+        fn exit(&self, span: &Id);
+    }
+}
+
+#[tokio::test]
 async fn test_tracing_connect_span() {
+    let mut mock_subscriber = MockSubscriber::new();
+    mock_subscriber.expect_event_enabled().returning(|_| false);
+    mock_subscriber.expect_record().returning(|_, _| {});
+    mock_subscriber
+        .expect_enabled()
+        .returning(|metadata| metadata.name() == CONNECT_SPAN_NAME);
+    mock_subscriber.expect_new_span().returning(|attributes| {
+        if attributes.metadata().name() == CONNECT_SPAN_NAME {
+            assert!(attributes.fields().field("apollo.connector.type").is_some());
+            assert!(attributes
+                .fields()
+                .field("apollo.connector.detail")
+                .is_some());
+            assert!(attributes
+                .fields()
+                .field("apollo.connector.field.name")
+                .is_some());
+            assert!(attributes
+                .fields()
+                .field("apollo.connector.selection")
+                .is_some());
+            assert!(attributes
+                .fields()
+                .field("apollo.connector.source.name")
+                .is_some());
+            assert!(attributes
+                .fields()
+                .field("apollo.connector.source.detail")
+                .is_some());
+            Id::from_u64(1)
+        } else {
+            panic!("unexpected span: {}", attributes.metadata().name());
+        }
+    });
+    mock_subscriber
+        .expect_enter()
+        .with(eq(Id::from_u64(1)))
+        .returning(|_| {});
+    mock_subscriber
+        .expect_exit()
+        .with(eq(Id::from_u64(1)))
+        .returning(|_| {});
+    let _guard = tracing::subscriber::set_default(mock_subscriber);
+
     let mock_server = MockServer::start().await;
     mock_api::users().mount(&mock_server).await;
 
-    let root_id = {
-        let root_span = test_span::reexports::tracing::span!(Level::ERROR, "root");
-
-        let root_id = root_span
-            .id()
-            .expect("couldn't get root span id; this cannot happen.");
-
-        execute(
-            STEEL_THREAD_SCHEMA,
-            &mock_server.uri(),
-            "query { users { id } }",
-            Default::default(),
-            None,
-            |_| {},
-        )
-        .instrument(root_span)
-        .await;
-        root_id
-    };
-
-    // Filter to just the connector service span
-    let filter = Filter::new(Level::ERROR).with_target(
-        String::from("apollo_router::services::connector_service"),
-        Level::INFO,
-    );
-
-    // Redact time offset and local port that change with every test run
-    insta::assert_json_snapshot!(get_spans_for_root(&root_id, &filter), {
-        ".children.*.record.entries[4][1]" => "[sent_time_offset_redacted]",
-        ".children.*.record.entries[7][1]" => "[source_detail_redacted]",
-    });
+    execute(
+        STEEL_THREAD_SCHEMA,
+        &mock_server.uri(),
+        "query { users { id } }",
+        Default::default(),
+        None,
+        |_| {},
+    )
+    .await;
 }
 
 #[tokio::test]