diff --git a/lib/datadog/ci.rb b/lib/datadog/ci.rb
index 818d180c..29a4ac93 100644
--- a/lib/datadog/ci.rb
+++ b/lib/datadog/ci.rb
@@ -3,9 +3,6 @@
 require_relative "ci/version"
 
 require "datadog/core"
-require "datadog/tracing"
-
-require_relative "ci/recorder"
 
 module Datadog
   # Public API for Datadog CI visibility
diff --git a/lib/datadog/ci/configuration/components.rb b/lib/datadog/ci/configuration/components.rb
index d01af7b1..355b2422 100644
--- a/lib/datadog/ci/configuration/components.rb
+++ b/lib/datadog/ci/configuration/components.rb
@@ -7,6 +7,7 @@
 require_relative "../test_visibility/flush"
 require_relative "../test_visibility/transport"
 require_relative "../transport/api/builder"
+require_relative "../recorder"
 
 module Datadog
   module CI
diff --git a/lib/datadog/ci/recorder.rb b/lib/datadog/ci/recorder.rb
index f3d63023..f62bfe7c 100644
--- a/lib/datadog/ci/recorder.rb
+++ b/lib/datadog/ci/recorder.rb
@@ -3,14 +3,14 @@
 require "datadog/tracing"
 require "datadog/tracing/contrib/analytics"
 
+require "rbconfig"
+
 require_relative "ext/app_types"
 require_relative "ext/test"
 require_relative "ext/environment"
 
 require_relative "span"
 
-require "rbconfig"
-
 module Datadog
   module CI
     # Common behavior for CI tests
diff --git a/lib/datadog/ci/span.rb b/lib/datadog/ci/span.rb
index 990c4965..aca57ca3 100644
--- a/lib/datadog/ci/span.rb
+++ b/lib/datadog/ci/span.rb
@@ -27,7 +27,7 @@ def failed!(exception: nil)
       def skipped!(exception: nil, reason: nil)
         tracer_span.set_tag(Ext::Test::TAG_STATUS, Ext::Test::Status::SKIP)
         tracer_span.set_error(exception) unless exception.nil?
-        tracer_span.set_tag(CI::Ext::Test::TAG_SKIP_REASON, reason) unless reason.nil?
+        tracer_span.set_tag(Ext::Test::TAG_SKIP_REASON, reason) unless reason.nil?
       end
 
       def set_tag(key, value)
diff --git a/spec/datadog/ci/configuration/components_spec.rb b/spec/datadog/ci/configuration/components_spec.rb
index 426baf99..68719ee6 100644
--- a/spec/datadog/ci/configuration/components_spec.rb
+++ b/spec/datadog/ci/configuration/components_spec.rb
@@ -89,11 +89,16 @@
         let(:api_key) { nil }
         let(:agentless_url) { nil }
         let(:dd_site) { nil }
+        let(:agentless_enabled) { false }
         let(:evp_proxy_supported) { false }
 
         context "is enabled" do
           let(:enabled) { true }
 
+          it "creates a CI recorder" do
+            expect(components.ci_recorder).to be_kind_of(Datadog::CI::Recorder)
+          end
+
           context "and when #agentless_mode" do
             context "is disabled" do
               let(:agentless_enabled) { false }