diff --git a/package.json b/package.json
index 83e87ef568..7a2921b4b6 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
     "@electron/notarize": "2.1.0",
     "@formatjs/intl": "2.6.7",
     "@mixer/parallel-prettier": "2.0.3",
-    "@signalapp/mock-server": "5.2.0",
+    "@signalapp/mock-server": "6.0.0",
     "@storybook/addon-a11y": "7.4.5",
     "@storybook/addon-actions": "7.4.5",
     "@storybook/addon-controls": "7.4.5",
diff --git a/ts/test-mock/setup-ci.ts b/ts/test-mock/setup-ci.ts
index 0871610349..5de27a1aaa 100644
--- a/ts/test-mock/setup-ci.ts
+++ b/ts/test-mock/setup-ci.ts
@@ -16,10 +16,16 @@ export async function mochaGlobalSetup(): Promise<void> {
   debug('Launching app before running all tests');
   const bootstrap = new Bootstrap();
   await bootstrap.init();
-  const app = await bootstrap.link();
 
-  debug('Closing app before running all tests');
-  await app.close();
-  await bootstrap.teardown();
-  debug('Done');
+  try {
+    const app = await bootstrap.link();
+
+    debug('Closing app before running all tests');
+    await app.close();
+    await bootstrap.teardown();
+    debug('Done');
+  } catch (error) {
+    await bootstrap.saveLogs();
+    throw error;
+  }
 }
diff --git a/yarn.lock b/yarn.lock
index 1a7445b3cf..95ee98d12c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3973,10 +3973,10 @@
     type-fest "^3.5.0"
     uuid "^8.3.0"
 
-"@signalapp/mock-server@5.2.0":
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-5.2.0.tgz#8d88f5b2d23c52be169847c5db09aa129637094c"
-  integrity sha512-W82JNBcQRlqnBp+x0Ct0kipfR6frLDlzpth4AA5AiT97JZhsJh6IjTVckUGt1AKJOf6eCKYDa++NTZMTXNzWLg==
+"@signalapp/mock-server@6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-6.0.0.tgz#a67e18b5cb928749c379c219c775a412ad5c181b"
+  integrity sha512-hzKqCQ8A0xSScn9bztwZnjdizI15wTuEjj/uwmzWylzsPxbcXkOOL+db9O0uTOKbDIl6nJFrsUFqQ8R6LC8TAg==
   dependencies:
     "@signalapp/libsignal-client" "^0.39.2"
     debug "^4.3.2"