diff --git a/lib/datadog/tracing/contrib/aws/service/dynamodb.rb b/lib/datadog/tracing/contrib/aws/service/dynamodb.rb
index d51210e115d..5185bc9141f 100644
--- a/lib/datadog/tracing/contrib/aws/service/dynamodb.rb
+++ b/lib/datadog/tracing/contrib/aws/service/dynamodb.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib
diff --git a/lib/datadog/tracing/contrib/aws/service/eventbridge.rb b/lib/datadog/tracing/contrib/aws/service/eventbridge.rb
index 484e2f1d7b9..6c86b1fdb11 100644
--- a/lib/datadog/tracing/contrib/aws/service/eventbridge.rb
+++ b/lib/datadog/tracing/contrib/aws/service/eventbridge.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib
diff --git a/lib/datadog/tracing/contrib/aws/service/kinesis.rb b/lib/datadog/tracing/contrib/aws/service/kinesis.rb
index ef48cfb515f..70f2a9e3e99 100644
--- a/lib/datadog/tracing/contrib/aws/service/kinesis.rb
+++ b/lib/datadog/tracing/contrib/aws/service/kinesis.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib
diff --git a/lib/datadog/tracing/contrib/aws/service/s3.rb b/lib/datadog/tracing/contrib/aws/service/s3.rb
index 297ac00370d..87b1a9f388a 100644
--- a/lib/datadog/tracing/contrib/aws/service/s3.rb
+++ b/lib/datadog/tracing/contrib/aws/service/s3.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib
diff --git a/lib/datadog/tracing/contrib/aws/service/sns.rb b/lib/datadog/tracing/contrib/aws/service/sns.rb
index 5b0f4dadf14..40cb0022344 100644
--- a/lib/datadog/tracing/contrib/aws/service/sns.rb
+++ b/lib/datadog/tracing/contrib/aws/service/sns.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib
diff --git a/lib/datadog/tracing/contrib/aws/service/sqs.rb b/lib/datadog/tracing/contrib/aws/service/sqs.rb
index a44abe85b95..2ab6c0cb03f 100644
--- a/lib/datadog/tracing/contrib/aws/service/sqs.rb
+++ b/lib/datadog/tracing/contrib/aws/service/sqs.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib
diff --git a/lib/datadog/tracing/contrib/aws/service/stepfunctions.rb b/lib/datadog/tracing/contrib/aws/service/states.rb
similarity index 96%
rename from lib/datadog/tracing/contrib/aws/service/stepfunctions.rb
rename to lib/datadog/tracing/contrib/aws/service/states.rb
index d4a2220efc0..f25ce53e563 100644
--- a/lib/datadog/tracing/contrib/aws/service/stepfunctions.rb
+++ b/lib/datadog/tracing/contrib/aws/service/states.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require_relative './base'
+require_relative '../ext'
+
 module Datadog
   module Tracing
     module Contrib
diff --git a/lib/datadog/tracing/contrib/aws/services.rb b/lib/datadog/tracing/contrib/aws/services.rb
index f2267988441..c775de3ee8b 100644
--- a/lib/datadog/tracing/contrib/aws/services.rb
+++ b/lib/datadog/tracing/contrib/aws/services.rb
@@ -1,3 +1,11 @@
+require_relative './service/sqs'
+require_relative './service/sns'
+require_relative './service/dynamodb'
+require_relative './service/kinesis'
+require_relative './service/eventbridge'
+require_relative './service/states'
+require_relative './service/s3'
+
 module Datadog
   module Tracing
     module Contrib
diff --git a/sig/datadog/tracing/contrib/aws/service/stepfunctions.rbs b/sig/datadog/tracing/contrib/aws/service/states.rbs
similarity index 100%
rename from sig/datadog/tracing/contrib/aws/service/stepfunctions.rbs
rename to sig/datadog/tracing/contrib/aws/service/states.rbs
diff --git a/spec/datadog/tracing/contrib/aws/integration_spec.rb b/spec/datadog/tracing/contrib/aws/integration_spec.rb
index 6f93ed4ff56..664318a7460 100644
--- a/spec/datadog/tracing/contrib/aws/integration_spec.rb
+++ b/spec/datadog/tracing/contrib/aws/integration_spec.rb
@@ -1,5 +1,3 @@
-require 'datadog/tracing/contrib/support/spec_helper'
-
 require 'datadog/tracing/contrib/aws/integration'
 
 RSpec.describe Datadog::Tracing::Contrib::Aws::Integration do
diff --git a/spec/datadog/tracing/contrib/aws/parsed_context_spec.rb b/spec/datadog/tracing/contrib/aws/parsed_context_spec.rb
index ca71f5de4da..1c928c7c12f 100644
--- a/spec/datadog/tracing/contrib/aws/parsed_context_spec.rb
+++ b/spec/datadog/tracing/contrib/aws/parsed_context_spec.rb
@@ -1,5 +1,3 @@
-require 'datadog/tracing/contrib/support/spec_helper'
-
 require 'aws-sdk'
 require 'datadog/tracing/contrib/aws/parsed_context'
 
diff --git a/spec/datadog/tracing/contrib/aws/service/dynamobdb_spec.rb b/spec/datadog/tracing/contrib/aws/service/dynamobdb_spec.rb
index 2f4580dc7bd..ea06b177e07 100644
--- a/spec/datadog/tracing/contrib/aws/service/dynamobdb_spec.rb
+++ b/spec/datadog/tracing/contrib/aws/service/dynamobdb_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'rspec'
-require 'lib/datadog/tracing/contrib/aws/service/base'
-require 'lib/datadog/tracing/contrib/aws/service/dynamodb'
+require 'datadog/tracing/contrib/aws/service/dynamodb'
 
 RSpec.describe Datadog::Tracing::Contrib::Aws::Service::DynamoDB do
   let(:span) { instance_double('Span') }
diff --git a/spec/datadog/tracing/contrib/aws/service/eventbrige_spec.rb b/spec/datadog/tracing/contrib/aws/service/eventbrige_spec.rb
index f9b8074fefa..ca15e3ac948 100644
--- a/spec/datadog/tracing/contrib/aws/service/eventbrige_spec.rb
+++ b/spec/datadog/tracing/contrib/aws/service/eventbrige_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'rspec'
-require 'lib/datadog/tracing/contrib/aws/service/base'
-require 'lib/datadog/tracing/contrib/aws/service/eventbridge'
+require 'datadog/tracing/contrib/aws/service/eventbridge'
 
 RSpec.describe Datadog::Tracing::Contrib::Aws::Service::EventBridge do
   let(:span) { instance_double('Span') }
diff --git a/spec/datadog/tracing/contrib/aws/service/kinesis_spec.rb b/spec/datadog/tracing/contrib/aws/service/kinesis_spec.rb
index 4d086afd64f..93a98de1dc5 100644
--- a/spec/datadog/tracing/contrib/aws/service/kinesis_spec.rb
+++ b/spec/datadog/tracing/contrib/aws/service/kinesis_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'rspec'
-require 'lib/datadog/tracing/contrib/aws/service/base'
-require 'lib/datadog/tracing/contrib/aws/service/kinesis'
+require 'datadog/tracing/contrib/aws/service/kinesis'
 
 RSpec.describe Datadog::Tracing::Contrib::Aws::Service::Kinesis do
   let(:span) { instance_double('Span') }
diff --git a/spec/datadog/tracing/contrib/aws/service/s3_spec.rb b/spec/datadog/tracing/contrib/aws/service/s3_spec.rb
index baf2eb5c5a4..f273d37ca08 100644
--- a/spec/datadog/tracing/contrib/aws/service/s3_spec.rb
+++ b/spec/datadog/tracing/contrib/aws/service/s3_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'rspec'
-require 'lib/datadog/tracing/contrib/aws/service/base'
-require 'lib/datadog/tracing/contrib/aws/service/s3'
+require 'datadog/tracing/contrib/aws/service/s3'
 
 RSpec.describe Datadog::Tracing::Contrib::Aws::Service::S3 do
   let(:span) { instance_double('Span') }
diff --git a/spec/datadog/tracing/contrib/aws/service/sns_spec.rb b/spec/datadog/tracing/contrib/aws/service/sns_spec.rb
index f871b16b7c8..8b3737b43e6 100644
--- a/spec/datadog/tracing/contrib/aws/service/sns_spec.rb
+++ b/spec/datadog/tracing/contrib/aws/service/sns_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'rspec'
-require 'lib/datadog/tracing/contrib/aws/service/base'
-require 'lib/datadog/tracing/contrib/aws/service/sns'
+require 'datadog/tracing/contrib/aws/service/sns'
 
 RSpec.describe Datadog::Tracing::Contrib::Aws::Service::SNS do
   let(:span) { instance_double('Span') }
diff --git a/spec/datadog/tracing/contrib/aws/service/sqs_spec.rb b/spec/datadog/tracing/contrib/aws/service/sqs_spec.rb
index bf87bfb697a..fe8dac8300b 100644
--- a/spec/datadog/tracing/contrib/aws/service/sqs_spec.rb
+++ b/spec/datadog/tracing/contrib/aws/service/sqs_spec.rb
@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
-require 'lib/datadog/tracing/contrib/aws/service/base'
-require 'lib/datadog/tracing/contrib/aws/service/sqs'
-require 'spec_helper'
-require 'rspec'
+require 'datadog/tracing/contrib/aws/service/sqs'
 
 RSpec.describe Datadog::Tracing::Contrib::Aws::Service::SQS do
   let(:span) { instance_double('Span') }
diff --git a/spec/datadog/tracing/contrib/aws/service/stepfunctions_spec.rb b/spec/datadog/tracing/contrib/aws/service/states_spec.rb
similarity index 95%
rename from spec/datadog/tracing/contrib/aws/service/stepfunctions_spec.rb
rename to spec/datadog/tracing/contrib/aws/service/states_spec.rb
index 128d6f3202e..cf06701793b 100644
--- a/spec/datadog/tracing/contrib/aws/service/stepfunctions_spec.rb
+++ b/spec/datadog/tracing/contrib/aws/service/states_spec.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'rspec'
-require 'lib/datadog/tracing/contrib/aws/service/base'
-require 'lib/datadog/tracing/contrib/aws/service/stepfunctions'
+require 'datadog/tracing/contrib/aws/service/states'
 
 RSpec.describe Datadog::Tracing::Contrib::Aws::Service::States do
   let(:span) { instance_double('Span') }
diff --git a/spec/datadog/tracing/contrib/aws/services_spec.rb b/spec/datadog/tracing/contrib/aws/services_spec.rb
new file mode 100644
index 00000000000..fd0e5f5c0cd
--- /dev/null
+++ b/spec/datadog/tracing/contrib/aws/services_spec.rb
@@ -0,0 +1,49 @@
+require 'datadog/tracing/contrib/aws/services'
+
+RSpec.describe Datadog::Tracing::Contrib::Aws do
+  describe 'constant `SERVICES`' do
+    subject(:services) { Datadog::Tracing::Contrib::Aws::SERVICES }
+
+    it do
+      expect(services).to be_frozen
+    end
+
+    it do
+      expect(services.length).to eq(109)
+    end
+
+    it 'contains strings' do
+      expect(services).to all(be_a String)
+    end
+
+    it 'contains frozen strings', skip: 'DEV-2.0: frozen string' do
+      expect(services).to all(be_frozen)
+    end
+  end
+
+  describe 'constant `SERVICE_HANDLERS`' do
+    subject(:handlers) { Datadog::Tracing::Contrib::Aws::SERVICE_HANDLERS }
+
+    it do
+      expect(handlers.length).to eq(7)
+    end
+
+    it do
+      expect(handlers.keys).to contain_exactly(
+        'sqs',
+        'sns',
+        'dynamodb',
+        'kinesis',
+        'eventbridge',
+        'states',
+        's3'
+      )
+    end
+
+    it do
+      expect(handlers.values).to all(
+        be_a Datadog::Tracing::Contrib::Aws::Service::Base
+      )
+    end
+  end
+end