diff --git a/.github/workflows/ci-build-image.yml b/.github/workflows/ci-build-image.yml
index c24cea936c..70a2a0d563 100644
--- a/.github/workflows/ci-build-image.yml
+++ b/.github/workflows/ci-build-image.yml
@@ -72,7 +72,6 @@ jobs:
         step: restore
     - run: git submodule init
     - run: git submodule update
-      if: ${{ !inputs.run-tests-only }}
     - run: mvn -B -U -Dbuild.arch=${{ inputs.build-arch }} clean package
       env:
         GITHUB_TOKEN_REF: ${{ secrets.GITHUB_TOKEN }}
@@ -112,9 +111,6 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
-    - uses: actions/download-artifact@v3
-      with:
-        name: cryostat-${{ inputs.build-arch }}
     - name: Load cryostat image
       run: podman load -i cryostat-${{ inputs.build-arch }}.tar
     - uses: skjolber/maven-cache-github-action@v1
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
index 3b611acae0..2c695b26e4 100644
--- a/.github/workflows/pr-ci.yml
+++ b/.github/workflows/pr-ci.yml
@@ -121,7 +121,7 @@ jobs:
           });
 
   check-test-results:
-    if: ${{ needs.build-and-test.result == 'success' || needs.retest-integration.result == 'success' }}
+    if: ${{ success(needs.build-and-test) || success(needs.retest-integration) }}
     runs-on: ubuntu-latest
     needs: [build-and-test, retest-integration]
     steps:
@@ -139,7 +139,6 @@ jobs:
     continue-on-error: true
           
   leave-test-status-comment:
-    if: ${{ needs.check-test-results.result == 'success' }}
     runs-on: ubuntu-latest
     needs: [check-test-results]
     steps:
@@ -147,9 +146,9 @@ jobs:
       uses: actions/github-script@v6
       with:
         script: |
-          const testStatus = "${{ needs.check-test-results.test-status }}";
           const currentTime = new Date().toLocaleString('en-US', { timeZone: 'America/Toronto' });
-          const commentBody = `Tests status: ${testStatus} at ${currentTime}.`;
+          const testStatus = "${{ needs.check-test-results.outputs.test-status }}";
+          const commentBody = `Tests status: ${test-status } ${currentTime}.`;
           github.rest.issues.createComment({
             issue_number: context.issue.number,
             owner: context.repo.owner,