diff --git a/dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientTest.groovy b/dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientTest.groovy
index bf29789292a..18438e9e4df 100644
--- a/dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientTest.groovy
+++ b/dd-java-agent/instrumentation/apache-httpclient-5/src/test/groovy/ApacheHttpClientTest.groovy
@@ -139,7 +139,7 @@ class ApacheClientRequest extends ApacheHttpClientTest<ClassicHttpRequest> {
 }
 
 @Timeout(5)
-class ApacheClientRequestContext extends ApacheHttpClientTest<ClassicHttpRequest> {
+class ApacheClientNullHostRequestContext extends ApacheHttpClientTest<ClassicHttpRequest> {
   @Override
   ClassicHttpRequest createRequest(String method, URI uri) {
     return new BasicClassicHttpRequest(method, uri)
@@ -147,7 +147,7 @@ class ApacheClientRequestContext extends ApacheHttpClientTest<ClassicHttpRequest
 
   @Override
   CloseableHttpResponse executeRequest(ClassicHttpRequest request, URI uri) {
-    return client.execute(request, new BasicHttpContext())
+    return client.execute(null, request, new BasicHttpContext())
   }
 }
 
@@ -164,6 +164,19 @@ class ApacheClientRequestResponseHandler extends ApacheHttpClientTest<ClassicHtt
   }
 }
 
+@Timeout(5)
+class ApacheClientRequestContext extends ApacheHttpClientTest<ClassicHttpRequest> {
+  @Override
+  ClassicHttpRequest createRequest(String method, URI uri) {
+    return new BasicClassicHttpRequest(method, uri)
+  }
+
+  @Override
+  CloseableHttpResponse executeRequest(ClassicHttpRequest request, URI uri) {
+    return client.execute(request, new BasicHttpContext())
+  }
+}
+
 @Timeout(5)
 class ApacheClientRequestContextResponseHandler extends ApacheHttpClientTest<ClassicHttpRequest> {
   @Override