diff --git a/test/nbrowser/MultiColumn.ts b/test/nbrowser/MultiColumn.ts
index f71380b4..a1815ed0 100644
--- a/test/nbrowser/MultiColumn.ts
+++ b/test/nbrowser/MultiColumn.ts
@@ -877,11 +877,13 @@ async function testChoices(colA: string = 'Left', colB: string = 'Right') {
   if (await getColumnType() === 'Choice List') {
     await gu.sendKeys(Key.ENTER);
   }
+  await gu.waitForServer();
   await gu.getCell(colB, 1).click();
   await gu.sendKeys("one", Key.ENTER);
   if (await getColumnType() === 'Choice List') {
     await gu.sendKeys(Key.ENTER);
   }
+  await gu.waitForServer();
   // Rename one of the choices.
   await selectColumns(colA, colB);
   const undo = await gu.begin();
@@ -941,6 +943,7 @@ const choiceEditor = {
   },
   async save() {
     await driver.find(".test-choice-list-entry-save").click();
+    await gu.waitForServer();
   },
   async cancel() {
     await driver.find(".test-choice-list-entry-cancel").click();
@@ -1023,12 +1026,14 @@ async function wrap(state?: boolean) {
   if (await buttons[0].matches('[class*=-selected]')) {
     if (state === false) {
       await buttons[0].click();
+      await gu.waitForServer();
       return false;
     }
     return true;
   }
   if (state === true) {
     await buttons[0].click();
+    await gu.waitForServer();
     return true;
   }
   return false;
@@ -1106,6 +1111,7 @@ async function alignment(value?: 'left' | 'right' | 'center') {
     if (value === 'right') {
       await buttons[2].click();
     }
+    await gu.waitForServer();
     return;
   }
   if (await buttons[0].matches('[class*=-selected]')) {
@@ -1293,6 +1299,7 @@ async function numMode(value?: 'currency' | 'percent' | 'exp' | 'decimal') {
         await driver.findContent('.test-numeric-mode .test-select-button', /Exp/).click();
       }
     }
+    await gu.waitForServer();
   }
   if (mode.length === 0) {
     return undefined;
diff --git a/test/nbrowser/testServer.ts b/test/nbrowser/testServer.ts
index 27a146e5..5316f149 100644
--- a/test/nbrowser/testServer.ts
+++ b/test/nbrowser/testServer.ts
@@ -97,7 +97,6 @@ export class TestServerMerged implements IMochaServer {
     const serverLog = process.env.VERBOSE ? 'inherit' : nodeLogFd;
     const env: Record<string, string> = {
       TYPEORM_DATABASE: this._getDatabaseFile(),
-      TEST_CLEAN_DATABASE: reset ? 'true' : '',
       GRIST_DATA_DIR: this.testDocDir,
       GRIST_INST_DIR: this.testDir,
       // uses the test installed plugins folder as the user installed plugins.
@@ -129,6 +128,7 @@ export class TestServerMerged implements IMochaServer {
       // This skips type-checking when running server, but reduces startup time a lot.
       TS_NODE_TRANSPILE_ONLY: 'true',
       ...process.env,
+      TEST_CLEAN_DATABASE: reset ? 'true' : '',
     };
     if (!process.env.REDIS_URL) {
       // Multiple doc workers only possible when redis is available.