diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3b8f141..43ad9f3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,6 +28,8 @@ jobs:
           - '3.1'
           - '3.2'
           - '3.3'
+          - '3.4'
+          - '4.0'
 
     steps:
     - uses: actions/checkout@v4
diff --git a/Gemfile b/Gemfile
index 15e9d38..8f478c8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,7 +23,7 @@ group :development, :test do
   gem "sentry-ruby"
   gem "honeybadger"
   gem "newrelic_rpm"
-  gem "ddtrace", "~> 1.8"
+  gem "datadog"
   gem "airbrake", "~> 13.0"
   gem "rollbar"
   gem "bugsnag"
diff --git a/spec/hutch/broker_spec.rb b/spec/hutch/broker_spec.rb
index 287139f..236ae61 100644
--- a/spec/hutch/broker_spec.rb
+++ b/spec/hutch/broker_spec.rb
@@ -95,7 +95,7 @@
 
     context 'when configured with a URI' do
       context 'which specifies the port' do
-        before { config[:uri] = 'amqp://guest:guest@127.0.0.1:5672/' }
+        before { config[:uri] = "amqp://#{config[:mq_username]}:#{config[:mq_password]}@#{config[:mq_host]}:#{config[:mq_port]}/" }
 
         it 'successfully connects' do
           c = broker.open_connection
@@ -105,7 +105,7 @@
       end
 
       context 'which does not specify port and uses the amqp scheme' do
-        before { config[:uri] = 'amqp://guest:guest@127.0.0.1/' }
+        before { config[:uri] = "amqp://#{config[:mq_username]}:#{config[:mq_password]}@#{config[:mq_host]}/" }
 
         it 'successfully connects' do
           c = broker.open_connection
@@ -115,7 +115,7 @@
       end
 
       context 'which specifies the amqps scheme' do
-        before { config[:uri] = 'amqps://guest:guest@127.0.0.1/' }
+        before { config[:uri] = "amqps://#{config[:mq_username]}:#{config[:mq_password]}@#{config[:mq_host]}/" }
 
         it 'utilises TLS' do
           expect(Hutch::Adapter).to receive(:new).with(