diff --git a/.github/workflows/derecho.yaml b/.github/workflows/derecho.yaml
index c1929b017..f956b46af 100644
--- a/.github/workflows/derecho.yaml
+++ b/.github/workflows/derecho.yaml
@@ -7,11 +7,17 @@ on:
     types: [ labeled ]
     
 jobs:
+
   setup:
     if: ${{ github.event.label.name == 'run-pr-tests' }}
     runs-on: hpc-runner
    
     steps:
+    - name: Prepare system
+      run: |
+        rm $SCRATCH/cs.s*
+	rm -fr $SCRATCH/SMS_Ld2*
+	rm -fr $GITHUB_WORKSPACE/*
     - name: Checkout code
       uses: actions/checkout@v4
     - name: Run git-fleximod
diff --git a/.github/workflows/reusable.yaml b/.github/workflows/reusable.yaml
index 16b9323dd..eec2953e5 100644
--- a/.github/workflows/reusable.yaml
+++ b/.github/workflows/reusable.yaml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test:
-    if: always()
+    if: success() || failure()
     env:
       CC: mpicc
       FC: mpifort
@@ -28,4 +28,7 @@ jobs:
       - name: check status
         run: |
           cd $SCRATCH
-          ./cs.status.${GITHUB_RUN_ID} --expected-fails-file $GITHUB_WORKSPACE/cime_config/testfiles/ExpectedTestFails.xml 
\ No newline at end of file
+          ./cs.status.${GITHUB_RUN_ID} --expected-fails-file $GITHUB_WORKSPACE/cime_config/testfiles/ExpectedTestFails.xml --summary | grep FAIL
+	  if [ $? == 0 ]; then
+	    return -1
+	  fi
\ No newline at end of file
diff --git a/cime_config/testfiles/ExpectedTestFails.xml b/cime_config/testfiles/ExpectedTestFails.xml
index 51811ca54..9d68b8465 100644
--- a/cime_config/testfiles/ExpectedTestFails.xml
+++ b/cime_config/testfiles/ExpectedTestFails.xml
@@ -36,11 +36,11 @@
     </phase>
   </test>
 -->
-  <test name="SMS_D.1x1_brazil.I1850Clm60BgcCrop.derecho_gnu.clm-mimics_matrixcn">
-    <phase name="RUN">
+  <test name="SMS_Ld2.ne30pg3_t232.BMT1850.derecho_nvhpc.allactive-defaultio">
+    <phase name="MODEL_BUILD">
       <status>FAIL</status>
-      <issue>#2780</issue>
-      <comment>This file requires at least one entry</comment>
+      <issue></issue>
+      <comment></comment>
     </phase>
   </test>