diff --git a/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts b/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts
index 08393378fb..0a34fb2bb4 100644
--- a/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts
+++ b/packages/server/src/appMigrations/migrations/tests/20240604153647_initial_sqs.spec.ts
@@ -66,64 +66,69 @@ function oldLinkDocument(): Omit<LinkDocument, "tableId"> {
   }
 }
 
-async function sqsDisabled(cb: () => Promise<void>) {
-  await config.withEnv({ SQS_MIGRATION_ENABLE: "" }, cb)
+type SQSEnvVar = "SQS_MIGRATION_ENABLE" | "SQS_SEARCH_ENABLE"
+
+async function sqsDisabled(envVar: SQSEnvVar, cb: () => Promise<void>) {
+  await config.withEnv({ [envVar]: "" }, cb)
 }
 
-async function sqsEnabled(cb: () => Promise<void>) {
-  await config.withEnv({ SQS_MIGRATION_ENABLE: "1" }, cb)
+async function sqsEnabled(envVar: SQSEnvVar, cb: () => Promise<void>) {
+  await config.withEnv({ [envVar]: "1" }, cb)
 }
 
-beforeAll(async () => {
-  await sqsDisabled(async () => {
-    await config.init()
-    const table = await config.api.table.save(basicTable())
-    tableId = table._id!
-    const db = dbCore.getDB(config.appId!)
-    // old link document
-    await db.put(oldLinkDocument())
-  })
-})
-
-describe("SQS migration", () => {
-  it("test migration runs as expected against an older DB", async () => {
-    const db = dbCore.getDB(config.appId!)
-    // confirm nothing exists initially
-    await sqsDisabled(async () => {
-      let error: any | undefined
-      try {
-        await db.get(SQLITE_DESIGN_DOC_ID)
-      } catch (err: any) {
-        error = err
-      }
-      expect(error).toBeDefined()
-      expect(error.status).toBe(404)
-    })
-    await sqsEnabled(async () => {
-      await processMigrations(config.appId!, MIGRATIONS)
-      const designDoc = await db.get<SQLiteDefinition>(SQLITE_DESIGN_DOC_ID)
-      expect(designDoc.sql.tables).toBeDefined()
-      const mainTableDef = designDoc.sql.tables[tableId]
-      expect(mainTableDef).toBeDefined()
-      expect(mainTableDef.fields[prefix("name")]).toEqual({
-        field: "name",
-        type: SQLiteType.TEXT,
+describe.each(["SQS_MIGRATION_ENABLE", "SQS_SEARCH_ENABLE"] as SQSEnvVar[])(
+  "SQS migration with (%s)",
+  envVar => {
+    beforeAll(async () => {
+      await sqsDisabled(envVar, async () => {
+        await config.init()
+        const table = await config.api.table.save(basicTable())
+        tableId = table._id!
+        const db = dbCore.getDB(config.appId!)
+        // old link document
+        await db.put(oldLinkDocument())
       })
-      expect(mainTableDef.fields[prefix("description")]).toEqual({
-        field: "description",
-        type: SQLiteType.TEXT,
-      })
-
-      const { tableId1, tableId2, rowId1, rowId2 } = oldLinkDocInfo()
-      const linkDoc = await db.get<LinkDocument>(oldLinkDocID())
-      expect(linkDoc.tableId).toEqual(
-        generateJunctionTableID(tableId1, tableId2)
-      )
-      // should have swapped the documents
-      expect(linkDoc.doc1.tableId).toEqual(tableId2)
-      expect(linkDoc.doc1.rowId).toEqual(rowId2)
-      expect(linkDoc.doc2.tableId).toEqual(tableId1)
-      expect(linkDoc.doc2.rowId).toEqual(rowId1)
     })
-  })
-})
+
+    it("test migration runs as expected against an older DB", async () => {
+      const db = dbCore.getDB(config.appId!)
+      // confirm nothing exists initially
+      await sqsDisabled(envVar, async () => {
+        let error: any | undefined
+        try {
+          await db.get(SQLITE_DESIGN_DOC_ID)
+        } catch (err: any) {
+          error = err
+        }
+        expect(error).toBeDefined()
+        expect(error.status).toBe(404)
+      })
+      await sqsEnabled(envVar, async () => {
+        await processMigrations(config.appId!, MIGRATIONS)
+        const designDoc = await db.get<SQLiteDefinition>(SQLITE_DESIGN_DOC_ID)
+        expect(designDoc.sql.tables).toBeDefined()
+        const mainTableDef = designDoc.sql.tables[tableId]
+        expect(mainTableDef).toBeDefined()
+        expect(mainTableDef.fields[prefix("name")]).toEqual({
+          field: "name",
+          type: SQLiteType.TEXT,
+        })
+        expect(mainTableDef.fields[prefix("description")]).toEqual({
+          field: "description",
+          type: SQLiteType.TEXT,
+        })
+
+        const { tableId1, tableId2, rowId1, rowId2 } = oldLinkDocInfo()
+        const linkDoc = await db.get<LinkDocument>(oldLinkDocID())
+        expect(linkDoc.tableId).toEqual(
+          generateJunctionTableID(tableId1, tableId2)
+        )
+        // should have swapped the documents
+        expect(linkDoc.doc1.tableId).toEqual(tableId2)
+        expect(linkDoc.doc1.rowId).toEqual(rowId2)
+        expect(linkDoc.doc2.tableId).toEqual(tableId1)
+        expect(linkDoc.doc2.rowId).toEqual(rowId1)
+      })
+    })
+  }
+)