diff --git a/.github/workflows/test-full-sync.yml b/.github/workflows/test-full-sync.yml
index 024d15dae1e..f9f5887050b 100644
--- a/.github/workflows/test-full-sync.yml
+++ b/.github/workflows/test-full-sync.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       network:
         default: 'Mainnet'
-  pull_request_review:
+  pull_request:
     branches:
       - main
     paths:
@@ -21,7 +21,6 @@ on:
       # workflow definitions
       - 'docker/**'
       - '.github/workflows/test-full-sync.yml'
-    types: [submitted]
 
 env:
   CARGO_INCREMENTAL: '1'
@@ -37,6 +36,9 @@ env:
 
 jobs:
   build:
+    # only run on Mergify head branches:
+    # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#running-your-workflow-based-on-the-head-or-base-branch-of-a-pull-request-1
+    if:  startsWith(github.head_ref, 'mergify/merge-queue/')
     name: Build images
     timeout-minutes: 210
     runs-on: ubuntu-latest
@@ -48,7 +50,7 @@ jobs:
       - name: Inject slug/short variables
         uses: rlespinasse/github-slug-action@v4
 
-        # Automatic tag management and OCI Image Format Specification for labels
+      # Automatic tag management and OCI Image Format Specification for labels
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v3.6.2
diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs
index a706d42f092..95e963387db 100644
--- a/zebrad/tests/acceptance.rs
+++ b/zebrad/tests/acceptance.rs
@@ -1694,10 +1694,11 @@ fn lightwalletd_integration() -> Result<()> {
         lightwalletd.expect_stdout_line_matches("Method not found.*error zcashd getblock rpc");
     let (_, zebrad) = zebrad.kill_on_error(result)?;
 
-    // zcash/lightwalletd exits with a fatal error here, but
-    // adityapk00/lightwalletd keeps trying the mempool
+    // zcash/lightwalletd exits with a fatal error here.
+    // adityapk00/lightwalletd keeps trying the mempool,
+    // but it sometimes skips the "Method not found" log line.
     let result =
-        lightwalletd.expect_stdout_line_matches("Mempool refresh error: -32601: Method not found");
+        lightwalletd.expect_stdout_line_matches("(Mempool refresh error: -32601: Method not found)|(Another refresh in progress, returning)");
     let (_, zebrad) = zebrad.kill_on_error(result)?;
 
     // Cleanup both processes