diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/CommandProcessor.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/CommandProcessor.java
index 5581006247..cf8d5f0c41 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/CommandProcessor.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/CommandProcessor.java
@@ -23,8 +23,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import neo4j.org.testkit.backend.messages.TestkitModule;
 import neo4j.org.testkit.backend.messages.requests.TestkitRequest;
+import neo4j.org.testkit.backend.messages.responses.BackendError;
 import neo4j.org.testkit.backend.messages.responses.DriverError;
-import neo4j.org.testkit.backend.messages.responses.TestkitErrorResponse;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
 
 import java.io.BufferedReader;
@@ -154,7 +154,7 @@ else if ( currentLine.equals( "#request end" ) )
                         // Unknown error, interpret this as a backend error.
                         // Report to frontend and rethrow, note that if socket been
                         // closed the writing will throw itself...
-                        writeResponse( TestkitErrorResponse.builder().errorMessage( e.toString() ).build() );
+                        writeResponse( BackendError.builder().data( BackendError.BackendErrorBody.builder().msg( e.toString() ).build() ).build() );
                         // This won't print if there was an IO exception since line above will rethrow
                         e.printStackTrace();
                         throw e;
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java
index 85366fbc4c..cdb22390a7 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/requests/NewDriver.java
@@ -23,11 +23,11 @@
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import neo4j.org.testkit.backend.TestkitState;
+import neo4j.org.testkit.backend.messages.responses.BackendError;
 import neo4j.org.testkit.backend.messages.responses.DomainNameResolutionRequired;
 import neo4j.org.testkit.backend.messages.responses.Driver;
 import neo4j.org.testkit.backend.messages.responses.DriverError;
 import neo4j.org.testkit.backend.messages.responses.ResolverResolutionRequired;
-import neo4j.org.testkit.backend.messages.responses.TestkitErrorResponse;
 import neo4j.org.testkit.backend.messages.responses.TestkitResponse;
 
 import java.net.URI;
@@ -67,8 +67,13 @@ public TestkitResponse process( TestkitState testkitState )
                                           data.authorizationToken.getTokens().get( "realm" ) );
             break;
         default:
-            return TestkitErrorResponse.builder().errorMessage( "Auth scheme " + data.authorizationToken.getTokens().get( "scheme" ) + "not implemented" )
-                                       .build();
+            return BackendError.builder()
+                               .data( BackendError
+                                              .BackendErrorBody.builder()
+                                                               .msg( "Auth scheme " + data.authorizationToken.getTokens().get( "scheme" ) +
+                                                                     "not implemented" )
+                                                               .build() )
+                               .build();
         }
 
         Config.ConfigBuilder configBuilder = Config.builder();
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitBackendErrorResponse.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/BackendError.java
similarity index 80%
rename from testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitBackendErrorResponse.java
rename to testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/BackendError.java
index e12c81210f..66fea5d2c8 100644
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitBackendErrorResponse.java
+++ b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/BackendError.java
@@ -25,11 +25,21 @@
 @Setter
 @Getter
 @Builder
-public class TestkitBackendErrorResponse implements TestkitResponse
+public class BackendError implements TestkitResponse
 {
+    private final BackendErrorBody data;
+
     @Override
     public String testkitName()
     {
         return "BackendError";
     }
+
+    @Setter
+    @Getter
+    @Builder
+    public static class BackendErrorBody
+    {
+        private String msg;
+    }
 }
diff --git a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitErrorResponse.java b/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitErrorResponse.java
deleted file mode 100644
index 2c2a02cc4f..0000000000
--- a/testkit-backend/src/main/java/neo4j/org/testkit/backend/messages/responses/TestkitErrorResponse.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) "Neo4j"
- * Neo4j Sweden AB [http://neo4j.com]
- *
- * This file is part of Neo4j.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package neo4j.org.testkit.backend.messages.responses;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
-@Setter
-@Getter
-@Builder
-public class TestkitErrorResponse implements TestkitResponse
-{
-    @JsonProperty("msg")
-    private String errorMessage;
-
-    @Override
-    public String testkitName()
-    {
-        return "Error";
-    }
-}