diff --git a/lib/datadog/ci/configuration/components.rb b/lib/datadog/ci/configuration/components.rb
index dcb12fc5..4d84a413 100644
--- a/lib/datadog/ci/configuration/components.rb
+++ b/lib/datadog/ci/configuration/components.rb
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "datadog/core/configuration/agent_settings_resolver"
+require "datadog/core/remote/negotiation"
+
+require_relative "../ext/transport"
 require_relative "../test_visibility/flush"
 require_relative "../test_visibility/transport"
 require_relative "../transport/api/builder"
diff --git a/lib/datadog/ci/test_visibility/transport.rb b/lib/datadog/ci/test_visibility/transport.rb
index 5313333c..03b12fec 100644
--- a/lib/datadog/ci/test_visibility/transport.rb
+++ b/lib/datadog/ci/test_visibility/transport.rb
@@ -9,7 +9,6 @@
 
 require_relative "serializers/factories/test_level"
 require_relative "../ext/transport"
-require_relative "../transport/http"
 
 module Datadog
   module CI
diff --git a/lib/datadog/ci/transport/api/base.rb b/lib/datadog/ci/transport/api/base.rb
index f231805f..6230b887 100644
--- a/lib/datadog/ci/transport/api/base.rb
+++ b/lib/datadog/ci/transport/api/base.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../ext/transport"
+
 module Datadog
   module CI
     module Transport
diff --git a/lib/datadog/ci/transport/api/builder.rb b/lib/datadog/ci/transport/api/builder.rb
index 0f379fba..cf65674d 100644
--- a/lib/datadog/ci/transport/api/builder.rb
+++ b/lib/datadog/ci/transport/api/builder.rb
@@ -2,6 +2,8 @@
 
 require_relative "ci_test_cycle"
 require_relative "evp_proxy"
+require_relative "../http"
+require_relative "../../ext/transport"
 
 module Datadog
   module CI
diff --git a/lib/datadog/ci/transport/api/ci_test_cycle.rb b/lib/datadog/ci/transport/api/ci_test_cycle.rb
index b2558256..b3cec84d 100644
--- a/lib/datadog/ci/transport/api/ci_test_cycle.rb
+++ b/lib/datadog/ci/transport/api/ci_test_cycle.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base"
-require_relative "../http"
+require_relative "../../ext/transport"
 
 module Datadog
   module CI
diff --git a/lib/datadog/ci/transport/api/evp_proxy.rb b/lib/datadog/ci/transport/api/evp_proxy.rb
index 6c520776..87ccd79c 100644
--- a/lib/datadog/ci/transport/api/evp_proxy.rb
+++ b/lib/datadog/ci/transport/api/evp_proxy.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
+require "datadog/core/environment/container"
+
 require_relative "base"
-require_relative "../http"
+require_relative "../../ext/transport"
 
 module Datadog
   module CI