diff --git a/libguh-core/jsonrpc/jsonrpcserver.cpp b/libguh-core/jsonrpc/jsonrpcserver.cpp
index f57e1d5d..3807c676 100644
--- a/libguh-core/jsonrpc/jsonrpcserver.cpp
+++ b/libguh-core/jsonrpc/jsonrpcserver.cpp
@@ -266,7 +266,7 @@ void JsonRPCServer::sendResponse(TransportInterface *interface, const QUuid &cli
     response.insert("status", "success");
     response.insert("params", params);
 
-    interface->sendData(clientId, QJsonDocument::fromVariant(response).toJson());
+    interface->sendData(clientId, QJsonDocument::fromVariant(response).toJson(QJsonDocument::Compact));
 }
 
 /*! Send a JSON error response to the client with the given \a clientId,
@@ -279,7 +279,7 @@ void JsonRPCServer::sendErrorResponse(TransportInterface *interface, const QUuid
     errorResponse.insert("status", "error");
     errorResponse.insert("error", error);
 
-    interface->sendData(clientId, QJsonDocument::fromVariant(errorResponse).toJson());
+    interface->sendData(clientId, QJsonDocument::fromVariant(errorResponse).toJson(QJsonDocument::Compact));
 }
 
 void JsonRPCServer::sendUnauthorizedResponse(TransportInterface *interface, const QUuid &clientId, int commandId, const QString &error)
@@ -289,7 +289,7 @@ void JsonRPCServer::sendUnauthorizedResponse(TransportInterface *interface, cons
     errorResponse.insert("status", "unauthorized");
     errorResponse.insert("error", error);
 
-    interface->sendData(clientId, QJsonDocument::fromVariant(errorResponse).toJson());
+    interface->sendData(clientId, QJsonDocument::fromVariant(errorResponse).toJson(QJsonDocument::Compact));
 }
 
 void JsonRPCServer::setup()
@@ -399,8 +399,8 @@ QString JsonRPCServer::formatAssertion(const QString &targetNamespace, const QSt
     QJsonDocument doc2 = QJsonDocument::fromVariant(data);
     return QString("\nMethod: %1\nTemplate: %2\nValue: %3")
             .arg(targetNamespace + "." + method)
-            .arg(QString(doc.toJson()))
-            .arg(QString(doc2.toJson()));
+            .arg(QString(doc.toJson(QJsonDocument::Compact)))
+            .arg(QString(doc2.toJson(QJsonDocument::Compact)));
 }
 
 void JsonRPCServer::sendNotification(const QVariantMap &params)
@@ -414,7 +414,7 @@ void JsonRPCServer::sendNotification(const QVariantMap &params)
     notification.insert("params", params);
 
     foreach (TransportInterface *interface, m_interfaces.keys()) {
-        interface->sendData(m_clients.keys(true), QJsonDocument::fromVariant(notification).toJson());
+        interface->sendData(m_clients.keys(true), QJsonDocument::fromVariant(notification).toJson(QJsonDocument::Compact));
     }
 }
 
@@ -461,7 +461,7 @@ void JsonRPCServer::clientConnected(const QUuid &clientId)
     handshake.insert("protocol version", JSON_PROTOCOL_VERSION);
     handshake.insert("initialSetupRequired", (interface->configuration().authenticationEnabled ? GuhCore::instance()->userManager()->users().isEmpty() : false));
     handshake.insert("authenticationRequired", interface->configuration().authenticationEnabled);
-    interface->sendData(clientId, QJsonDocument::fromVariant(handshake).toJson());
+    interface->sendData(clientId, QJsonDocument::fromVariant(handshake).toJson(QJsonDocument::Compact));
 }
 
 void JsonRPCServer::clientDisconnected(const QUuid &clientId)
diff --git a/libguh-core/jsonrpc/jsontypes.cpp b/libguh-core/jsonrpc/jsontypes.cpp
index 6806fe8f..76114170 100644
--- a/libguh-core/jsonrpc/jsontypes.cpp
+++ b/libguh-core/jsonrpc/jsontypes.cpp
@@ -1572,7 +1572,7 @@ QPair<bool, QString> JsonTypes::validateMap(const QVariantMap &templateMap, cons
             qCWarning(dcJsonRpc) << "Expected:      " << templateMap;
             qCWarning(dcJsonRpc) << "Got:           " << map;
             QJsonDocument jsonDoc = QJsonDocument::fromVariant(map);
-            return report(false, QString("Missing key %1 in %2").arg(key).arg(QString(jsonDoc.toJson())));
+            return report(false, QString("Missing key %1 in %2").arg(key).arg(QString(jsonDoc.toJson(QJsonDocument::Compact))));
         }
         if (map.contains(strippedKey)) {
             QPair<bool, QString> result = validateVariant(templateMap.value(key), map.value(strippedKey));
@@ -1590,7 +1590,7 @@ QPair<bool, QString> JsonTypes::validateMap(const QVariantMap &templateMap, cons
         if (!templateMap.contains(key) && !templateMap.contains(optKey)) {
             qCWarning(dcJsonRpc) << "Forbidden param" << key << "in params";
             QJsonDocument jsonDoc = QJsonDocument::fromVariant(map);
-            return report(false, QString("Forbidden key \"%1\" in %2").arg(key).arg(QString(jsonDoc.toJson())));
+            return report(false, QString("Forbidden key \"%1\" in %2").arg(key).arg(QString(jsonDoc.toJson(QJsonDocument::Compact))));
         }
     }
 
diff --git a/libguh-core/mocktcpserver.cpp b/libguh-core/mocktcpserver.cpp
index 10c5c2d8..dc57d32c 100644
--- a/libguh-core/mocktcpserver.cpp
+++ b/libguh-core/mocktcpserver.cpp
@@ -50,7 +50,7 @@ void MockTcpServer::sendData(const QUuid &clientId, const QByteArray &data)
 void MockTcpServer::sendData(const QList<QUuid> &clients, const QByteArray &data)
 {
     foreach (const QUuid &clientId, clients) {
-        sendData(clientId, data);
+        sendData(clientId, data + '\n');
     }
 }
 
diff --git a/libguh-core/tcpserver.cpp b/libguh-core/tcpserver.cpp
index 311bb382..d6fe83f2 100644
--- a/libguh-core/tcpserver.cpp
+++ b/libguh-core/tcpserver.cpp
@@ -75,7 +75,7 @@ void TcpServer::sendData(const QUuid &clientId, const QByteArray &data)
     QTcpSocket *client = 0;
     client = m_clientList.value(clientId);
     if (client) {
-        client->write(data);
+        client->write(data + '\n');
     }
 }
 
diff --git a/libguh-core/websocketserver.cpp b/libguh-core/websocketserver.cpp
index 4a34f61d..57a38fde 100644
--- a/libguh-core/websocketserver.cpp
+++ b/libguh-core/websocketserver.cpp
@@ -86,7 +86,7 @@ void WebSocketServer::sendData(const QUuid &clientId, const QByteArray &data)
     QWebSocket *client = 0;
     client = m_clientList.value(clientId);
     if (client) {
-        client->sendTextMessage(data);
+        client->sendTextMessage(data + '\n');
     }
 }
 
diff --git a/tests/auto/guhtestbase.cpp b/tests/auto/guhtestbase.cpp
index d097376d..7c756ced 100644
--- a/tests/auto/guhtestbase.cpp
+++ b/tests/auto/guhtestbase.cpp
@@ -220,7 +220,7 @@ QVariant GuhTestBase::injectAndWait(const QString &method, const QVariantMap &pa
     QJsonDocument jsonDoc = QJsonDocument::fromVariant(call);
     QSignalSpy spy(m_mockTcpServer, SIGNAL(outgoingData(QUuid,QByteArray)));
 
-    m_mockTcpServer->injectData(m_clientId, jsonDoc.toJson());
+    m_mockTcpServer->injectData(m_clientId, jsonDoc.toJson(QJsonDocument::Compact));
 
     if (spy.count() == 0) {
         spy.wait();
diff --git a/tests/auto/websocketserver/testwebsocketserver.cpp b/tests/auto/websocketserver/testwebsocketserver.cpp
index ba1721b6..ecdcfc86 100644
--- a/tests/auto/websocketserver/testwebsocketserver.cpp
+++ b/tests/auto/websocketserver/testwebsocketserver.cpp
@@ -183,7 +183,7 @@ QVariant TestWebSocketServer::injectSocketAndWait(const QString &method, const Q
     }
 
     QSignalSpy spy(socket, SIGNAL(textMessageReceived(QString)));
-    socket->sendTextMessage(QString(jsonDoc.toJson()));
+    socket->sendTextMessage(QString(jsonDoc.toJson(QJsonDocument::Compact)));
     spy.wait();
 
     socket->close();