diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce41c759069..3cefab38d24 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -601,11 +601,12 @@ agent_integration_tests:
     GRADLE_TARGET: "traceAgentTest"
     CACHE_TYPE: "base"
   services:
-    - name: datadog/agent:7.34.0
+    - name: registry.ddbuild.io/images/mirror/datadog/agent:7.40.1
       alias: local-agent
       variables:
         DD_APM_ENABLED: "true"
         DD_BIND_HOST: "0.0.0.0"
+        DD_HOSTNAME: "local-agent"
         DD_API_KEY: "invalid_key_but_this_is_fine"
 
 test_base:
diff --git a/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy b/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy
index 7d0fc3cfd0d..f2fe38cc18d 100644
--- a/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy
+++ b/dd-trace-core/src/traceAgentTest/groovy/AbstractTraceAgentTest.groovy
@@ -18,10 +18,11 @@ abstract class AbstractTraceAgentTest extends DDSpecification {
      and we use 'testcontainers' for this.
      */
     if ("true" != System.getenv("CI")) {
-      agentContainer = new GenericContainer("datadog/agent:7.34.0")
+      agentContainer = new GenericContainer("datadog/agent:7.40.1")
         .withEnv(["DD_APM_ENABLED": "true",
           "DD_BIND_HOST"  : "0.0.0.0",
           "DD_API_KEY"    : "invalid_key_but_this_is_fine",
+          "DD_HOSTNAME"   : "doesnotexist",
           "DD_LOGS_STDOUT": "yes"])
         .withExposedPorts(datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_AGENT_PORT)
         .withStartupTimeout(Duration.ofSeconds(120))