diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpClientTransformFlow.scala b/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpClientTransformFlow.scala
index e4e58331d9..b0a06b3d4e 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpClientTransformFlow.scala
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/main/scala/datadog/trace/instrumentation/akkahttp/AkkaHttpClientTransformFlow.scala
@@ -30,7 +30,9 @@ object AkkaHttpClientTransformFlow {
         .withTag(Tags.COMPONENT.getKey, "akka-http-client")
         .withTag(Tags.HTTP_URL.getKey, request.getUri.toString)
         .start()
-      if (Config.get.isHttpClientSplitByDomain) span.setTag(DDTags.SERVICE_NAME, request.getUri.host.address)
+      if (Config.get.isHttpClientSplitByDomain) {
+        span.setTag(DDTags.SERVICE_NAME, request.getUri.host.address)
+      }
       val headers = new AkkaHttpClientInstrumentation.AkkaHttpHeaders(request)
       GlobalTracer.get.inject(span.context, Format.Builtin.HTTP_HEADERS, headers)
       (headers.getRequest, data)
diff --git a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
index dc35bd614d..a5d1023b9c 100644
--- a/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
@@ -102,11 +102,9 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
     }
 
     where:
-    route     | expectedStatus | expectedError | expectedMessage
-    "success" | 200            | false         | MESSAGE
-    "error"   | 500            | true          | null
-
-    renameService = true
+    route     | expectedStatus | expectedError | expectedMessage | renameService
+    "success" | 200            | false         | MESSAGE         | true
+    "error"   | 500            | true          | null            | false
   }
 
   def "error request trace"() {
@@ -190,14 +188,13 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
     setup:
     def url = server.address.resolve("/" + route).toURL()
 
-    CompletionStage<Pair<Try<HttpResponse>, Integer>> sink = Source
-      .<Pair<HttpRequest, Integer>> single(new Pair(HttpRequest.create(url.toString()), 1))
-      .via(pool)
-      .runWith(Sink.<Pair<Try<HttpResponse>, Integer>> head(), materializer)
-
     when:
     HttpResponse response = withConfigOverride("dd.$Config.HTTP_CLIENT_HOST_SPLIT_BY_DOMAIN", "$renameService") {
-      sink.toCompletableFuture().get().first().get()
+      Source
+        .<Pair<HttpRequest, Integer>> single(new Pair(HttpRequest.create(url.toString()), 1))
+        .via(pool)
+        .runWith(Sink.<Pair<Try<HttpResponse>, Integer>> head(), materializer)
+        .toCompletableFuture().get().first().get()
     }
     String message = readMessage(response)
 
@@ -236,11 +233,9 @@ class AkkaHttpClientInstrumentationTest extends AgentTestRunner {
     }
 
     where:
-    route     | expectedStatus | expectedError | expectedMessage
-    "success" | 200            | false         | MESSAGE
-    "error"   | 500            | true          | null
-
-    renameService = true
+    route     | expectedStatus | expectedError | expectedMessage | renameService
+    "success" | 200            | false         | MESSAGE         | true
+    "error"   | 500            | true          | null            | false
   }
 
   def "error request pool trace"() {