diff --git a/src/__tests__/server.electron.js b/src/__tests__/server.electron.js
index 8095bcbbe..ddab7e95f 100644
--- a/src/__tests__/server.electron.js
+++ b/src/__tests__/server.electron.js
@@ -26,18 +26,31 @@ beforeAll(() => {
 test('servers starting at ports', done => {
   const serversToBeStarted = new Set([SECURE_PORT, INSECURE_PORT]);
 
-  server.addListener('listening', port => {
-    if (!serversToBeStarted.has(port)) {
-      done.fail(Error(`unknown server started at port ${port}`));
-    } else {
-      serversToBeStarted.delete(port);
-    }
-    if (serversToBeStarted.size === 0) {
-      done();
-    }
+  return new Promise((resolve, reject) => {
+    server.addListener('listening', port => {
+      if (!serversToBeStarted.has(port)) {
+        throw Error(`unknown server started at port ${port}`);
+      } else {
+        serversToBeStarted.delete(port);
+      }
+      if (serversToBeStarted.size === 0) {
+        done();
+        resolve();
+      }
+    });
   });
 });
 
+test(
+  'Layout plugin is connecting',
+  done => {
+    server.addListener('new-client', (client: Client) => {
+      done();
+    });
+  },
+  10000,
+);
+
 afterAll(() => {
   server.close();
 });