diff --git a/batch-processing/src/test/java/org/wildfly/quickstarts/batch/BasicRuntimeIT.java b/batch-processing/src/test/java/org/wildfly/quickstarts/batch/BasicRuntimeIT.java
index 6f2bdfaea8..24c2496321 100644
--- a/batch-processing/src/test/java/org/wildfly/quickstarts/batch/BasicRuntimeIT.java
+++ b/batch-processing/src/test/java/org/wildfly/quickstarts/batch/BasicRuntimeIT.java
@@ -54,7 +54,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
                 .build();
         final HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
         assertEquals(200, response.statusCode());
-        final String[] bodyLines = response.body().toString().split(System.lineSeparator());
+        final String[] bodyLines = response.body().lines().toArray(String[]::new);
         assertEquals("<meta http-equiv=\"Refresh\" content=\"0; URL=batch.jsf\">", bodyLines[bodyLines.length -3]);
     }
 }
diff --git a/cmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java b/cmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java
index 2f7accc448..904e84ee1b 100644
--- a/cmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java
+++ b/cmt/src/test/java/org/wildfly/quickstarts/cmt/BasicRuntimeIT.java
@@ -54,7 +54,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
                 .build();
         final HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
         assertEquals(200, response.statusCode());
-        final String[] bodyLines = response.body().toString().split(System.lineSeparator());
+        final String[] bodyLines = response.body().lines().toArray(String[]::new);
         assertEquals("<meta http-equiv=\"Refresh\" content=\"0; URL=addCustomer.jsf\">", bodyLines[bodyLines.length -3]);
     }
 
diff --git a/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java b/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java
index ce0a7558bb..dbb277e7a6 100644
--- a/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java
+++ b/ee-security/src/test/java/org/jboss/as/quickstarts/ee_security/BasicRuntimeIT.java
@@ -72,7 +72,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
                 .build();
         response = HttpClient.newHttpClient().send(request, HttpResponse.BodyHandlers.ofString());
         assertEquals(200, response.statusCode());
-        String[] lines = response.body().toString().split(System.lineSeparator());
+        String[] lines = response.body().lines().toArray(String[]::new);
         assertEquals("SecuredServlet - doGet()", lines[0].trim());
         assertEquals("Identity as available from SecurityContext 'quickstartUser'", lines[1].trim());
         assertEquals("Identity as available from injection 'quickstartUser'", lines[2].trim());
diff --git a/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/BasicRuntimeIT.java b/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/BasicRuntimeIT.java
index 209de8839a..555d9e5b83 100644
--- a/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/BasicRuntimeIT.java
+++ b/ejb-multi-server/app-web/src/test/java/org/jboss/as/quickstarts/ejb/multi/server/BasicRuntimeIT.java
@@ -31,7 +31,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
                 .build();
         final HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
         assertEquals(200, response.statusCode());
-        final String[] bodyLines = response.body().toString().split(System.lineSeparator());
+        final String[] bodyLines = response.body().lines().toArray(String[]::new);
         assertEquals("<meta http-equiv=\"Refresh\" content=\"0; URL=ejbinvoke.jsf\">", bodyLines[bodyLines.length-3].strip());
     }
 }
diff --git a/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java b/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java
index e276e149d0..0706fb3958 100644
--- a/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java
+++ b/ejb-throws-exception/web/src/test/java/org/jboss/as/quickstarts/ear/controller/BasicRuntimeIT.java
@@ -51,7 +51,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
                 .build();
         final HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
         assertEquals(200, response.statusCode());
-        final String[] bodyLines = response.body().toString().split(System.lineSeparator());
+        final String[] bodyLines = response.body().lines().toArray(String[]::new);
         assertEquals("<meta http-equiv=\"Refresh\" content=\"0; URL=index.jsf\">", bodyLines[bodyLines.length-3].strip());
     }
 }
\ No newline at end of file
diff --git a/helloworld-singleton/src/test/java/org/jboss/as/quickstarts/singleton/BasicRuntimeIT.java b/helloworld-singleton/src/test/java/org/jboss/as/quickstarts/singleton/BasicRuntimeIT.java
index 8bf0e45e43..15eefc0b73 100644
--- a/helloworld-singleton/src/test/java/org/jboss/as/quickstarts/singleton/BasicRuntimeIT.java
+++ b/helloworld-singleton/src/test/java/org/jboss/as/quickstarts/singleton/BasicRuntimeIT.java
@@ -53,7 +53,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
                 .build();
         final HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
         Assertions.assertEquals(200, response.statusCode());
-        final String[] bodyLines = response.body().toString().split(System.lineSeparator());
+        final String[] bodyLines = response.body().lines().toArray(String[]::new);
         Assertions.assertEquals("<meta http-equiv=\"Refresh\" content=\"0; URL=home.jsf\">", bodyLines[bodyLines.length-3]);
     }
 }
diff --git a/hibernate/src/test/java/org/jboss/as/quickstart/hibernate/BasicRuntimeIT.java b/hibernate/src/test/java/org/jboss/as/quickstart/hibernate/BasicRuntimeIT.java
index e28a932517..da07c5510d 100644
--- a/hibernate/src/test/java/org/jboss/as/quickstart/hibernate/BasicRuntimeIT.java
+++ b/hibernate/src/test/java/org/jboss/as/quickstart/hibernate/BasicRuntimeIT.java
@@ -53,7 +53,7 @@ public void testHTTPEndpointIsAvailable() throws IOException, InterruptedExcepti
                 .build();
         final HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
         Assertions.assertEquals(200, response.statusCode());
-        final String[] bodyLines = response.body().toString().split(System.lineSeparator());
+        final String[] bodyLines = response.body().lines().toArray(String[]::new);
         Assertions.assertEquals("<meta http-equiv=\"Refresh\" content=\"0; URL=index.jsf\">", bodyLines[bodyLines.length-3]);
     }
 }
diff --git a/servlet-security/src/test/java/org/jboss/as/quickstarts/servlet_security/BasicRuntimeIT.java b/servlet-security/src/test/java/org/jboss/as/quickstarts/servlet_security/BasicRuntimeIT.java
index 43dce09b2c..4716b62fcd 100644
--- a/servlet-security/src/test/java/org/jboss/as/quickstarts/servlet_security/BasicRuntimeIT.java
+++ b/servlet-security/src/test/java/org/jboss/as/quickstarts/servlet_security/BasicRuntimeIT.java
@@ -67,9 +67,9 @@ protected PasswordAuthentication getPasswordAuthentication() {
                 return new PasswordAuthentication("quickstartUser", "quickstartPwd1!".toCharArray());
             }
         }).build();
-        HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofString());
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
         Assertions.assertEquals(200, response.statusCode());
-        String[] lines = response.body().toString().split(System.lineSeparator());
+        String[] lines = response.body().lines().toArray(String[]::new);
         Assertions.assertEquals("<h1>Successfully called Secured Servlet </h1>", lines[1].trim());
         Assertions.assertEquals("<p>Principal  : quickstartUser</p>", lines[2].trim());
         Assertions.assertEquals("<p>Remote User : quickstartUser</p>", lines[3].trim());