diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java b/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java
index 4afdd0cd..4016cf48 100644
--- a/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/NonDestructiveOpsIT.java
@@ -5,6 +5,7 @@
  */
 package com.datastax.mgmtapi;
 
+import static io.netty.util.CharsetUtil.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.awaitility.Awaitility.await;
@@ -787,6 +788,7 @@ public void testAsyncRepair() throws IOException, URISyntaxException, Interrupte
         .atMost(Duration.ofMinutes(5))
         .untilAsserted(
             () -> {
+              client.get()
               Pair<Integer, String> getJobDetailsResponse =
                   client
                       .get(getJobDetailsUri.toURL())
@@ -1013,13 +1015,11 @@ private String responseAsString(FullHttpResponse r) {
   }
 
   private Pair<Integer, String> responseAsCodeAndBody(FullHttpResponse r) {
-    if (r.content().readableBytes() > 0) {
-      byte[] result = new byte[r.content().readableBytes()];
-      r.content().readBytes(result);
-      String payload = new String(result);
-      return Pair.of(r.status().code(), payload);
+    FullHttpResponse copy = r.copy();
+    if (copy.content().readableBytes() > 0) {
+      return Pair.of(copy.status().code(), copy.content().toString(UTF_8));
     }
 
-    return Pair.of(r.status().code(), null);
+    return Pair.of(copy.status().code(), null);
   }
 }
diff --git a/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/NettyHttpClient.java b/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/NettyHttpClient.java
index f9a3d052..94ecedc0 100644
--- a/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/NettyHttpClient.java
+++ b/management-api-server/src/test/java/com/datastax/mgmtapi/helpers/NettyHttpClient.java
@@ -180,7 +180,7 @@ private CompletableFuture<FullHttpResponse> buildAndSendRequest(HttpMethod metho
     request.headers().set(HttpHeaderNames.HOST, url.getHost());
 
     // Send the HTTP request.
-    client.writeAndFlush(request);
+    client.writeAndFlush(request).awaitUninterruptibly();
 
     return result;
   }