diff --git a/.github/actions/print-logfiles/action.yml b/.github/actions/print-logfiles/action.yml
index 83268a737..bea7f59ce 100644
--- a/.github/actions/print-logfiles/action.yml
+++ b/.github/actions/print-logfiles/action.yml
@@ -19,16 +19,16 @@ runs:
   steps:
   - name: Print all the nameserver log files
     run: |
-      for i in ${{ inputs.nameserver-dir }}/*.log; do
+      for i in ${{ github.workspace }}/*.log ${{ inputs.nameserver-dir }}/*.log; do
         echo ">>> Logfile $i:" >&2
         cat "$i" >&2 || true
       done
       echo ">>> Logfile cascade-startup.log:" >&2
       cat "${{ inputs.cascade-dir }}/cascade-startup.log" >&2 || true
       echo ">>> Logfile cascade.log:" >&2
-      cat "${{ inputs.cascade-dir }}//cascade.log" >&2 || true
+      cat "${{ inputs.cascade-dir }}/cascade.log" >&2 || true
       echo ">>> Config cascade:" >&2
-      cat "${{ inputs.cascade-dir }}//config.toml" >&2 || true
+      cat "${{ inputs.cascade-dir }}/config.toml" >&2 || true
       echo ">>> Logfile manage-test-environment.log:" >&2
       cat "manage-test-environment.log" >&2 || true
       echo ">>> Config resolv.conf:" >&2
diff --git a/integration-tests/tests/add-zone-query/action.yml b/integration-tests/tests/add-zone-query/action.yml
index 390681523..4d58860a2 100644
--- a/integration-tests/tests/add-zone-query/action.yml
+++ b/integration-tests/tests/add-zone-query/action.yml
@@ -43,7 +43,7 @@ runs:
         done
     - name: Query zone
       run: |
-        dig @127.0.0.1 -p 4542 example.test AXFR
+        dig @127.0.0.1 -p 4542 example.test AXFR > dig-query.log
     - name: Tell the NSD secondary that the zone is now available
       # Only necessary if NOTIFY is not setup for cascade
       run: |
diff --git a/integration-tests/tests/ixfr-in/action.yml b/integration-tests/tests/ixfr-in/action.yml
index 8afbdd7dd..3561577ee 100644
--- a/integration-tests/tests/ixfr-in/action.yml
+++ b/integration-tests/tests/ixfr-in/action.yml
@@ -71,6 +71,7 @@ runs:
         SOA_RR=$(dig +short @127.0.0.1 -p 4540 example.test SOA)
         if [[ "${SOA_RR}" != "ns1.example.test. mail.example.test. 1 60 60 3600 5" ]]; then
           echo "::error:: Expected SOA serial '1' but dig reports '${SOA_RR}'"
+          dig @127.0.0.1 -p 4540 example.test AXFR
           exit 1
         fi
 
@@ -194,16 +195,10 @@ runs:
 
     - name: Query changed RRs at Cascade publication server
       run: |
-        WWW_A_RR=$(dig +short @127.0.0.1 -p 4542 www.example.test A)
-        if [[ "${WWW_A_RR}" != "192.168.0.1" ]]; then
-          echo "::error:: Expected modified RR but dig reports '${WWW_A_RR}'"
-          exit 1
-        fi
-        MAIL_MX_RR=$(dig +short @127.0.0.1 -p 4542 mail.example.test MX)
-        if [[ "${MAIL_MX_RR}" != "20 example.test." ]]; then
-          echo "::error:: Expected modified RR but dig reports '${MAIL_MX_RR}'"
-          exit 1
-        fi
+        # https://askubuntu.com/a/1232402
+        dig @127.0.0.1 -p 4542 example.test AXFR | tr -s '[:blank:]' ',' > dig-query.log
+        grep -qF "www.example.test.,5,IN,A,192.168.0.1" dig-query.log
+        grep -qF "mail.example.test.,5,IN,MX,20,example.test." dig-query.log
 
     - name: Print log files on any failure in this job
       uses: ./.github/actions/print-logfiles