diff --git a/src/package.json b/src/package.json
index bf98e0929..e89c59f3f 100644
--- a/src/package.json
+++ b/src/package.json
@@ -109,8 +109,8 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha --import=tsx --timeout 990000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
-    "test-container": "mocha --import=tsx --timeout 99000 tests/container/specs/api",
+    "test": "mocha --import=tsx --timeout 4000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
+    "test-container": "mocha --import=tsx --timeout 5000 tests/container/specs/api",
     "dev": "node --import tsx node/server.ts",
     "prod": "node --import tsx node/server.ts",
     "ts-check": "tsc --noEmit",
diff --git a/src/tests/backend/common.js b/src/tests/backend/common.js
index 05274edc5..8172e1e87 100644
--- a/src/tests/backend/common.js
+++ b/src/tests/backend/common.js
@@ -188,7 +188,6 @@ exports.handshake = async (socket, padId, token = padutils.generateAuthorToken()
  * Convenience wrapper around `socket.send()` that waits for acknowledgement.
  */
 exports.sendMessage = async (socket, message) => await new Promise((resolve, reject) => {
-  if(message.type === "CHANGESET_REQ")
   socket.emit('message', message, (errInfo) => {
     if (errInfo != null) {
       const {name, message} = errInfo;
diff --git a/src/tests/backend/specs/messages.js b/src/tests/backend/specs/messages.js
index 643005f12..827f73588 100644
--- a/src/tests/backend/specs/messages.js
+++ b/src/tests/backend/specs/messages.js
@@ -38,6 +38,7 @@ describe(__filename, function () {
     res = await agent.get(`/p/${roPadId}`).expect(200);
     roSocket = await common.connect(res);
     await common.handshake(roSocket, roPadId);
+    await new Promise(resolve => setTimeout(resolve, 1000));
   });
 
   afterEach(async function () {