diff --git a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java b/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java
index 76cfcbe..dc7896c 100644
--- a/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java
+++ b/asterix-app/src/test/java/edu/uci/ics/asterix/test/runtime/ExecutionTest.java
@@ -150,11 +150,6 @@
         // Execute the method.
         int statusCode = client.executeMethod(method);
 
-        // Read the response body as String.
-        String responseBody = method.getResponseBodyAsString();
-
-        System.out.println("DDL: " + responseBody);
-
         // Check if the method was executed successfully.
         if (statusCode != HttpStatus.SC_OK) {
             System.err.println("Method failed: " + method.getStatusLine());
@@ -180,11 +175,6 @@
         // Execute the method.
         int statusCode = client.executeMethod(method);
 
-        // Read the response body as String.
-        String responseBody = method.getResponseBodyAsString();
-
-        System.out.println("Update: " + responseBody);
-
         // Check if the method was executed successfully.
         if (statusCode != HttpStatus.SC_OK) {
             System.err.println("Method failed: " + method.getStatusLine());
@@ -221,8 +211,6 @@
             // Read the response body as String.
             String responseBody = method.getResponseBodyAsString();
 
-            System.out.println(responseBody);
-
             result = new JSONObject(responseBody);
         } catch (Exception e) {
             System.out.println(e.getMessage());
