Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -r1177293b3166db6a2bc6e19c6fdf488d064fd13c
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 1177293b3166db6a2bc6e19c6fdf488d064fd13c)
@@ -1047,11 +1047,15 @@
 
     if ( TRUE == didTimeout( syringeOcclusionDelayStartTime, SYRINGE_PUMP_OCCLUSION_CHECK_DELAY ) )
     {
-        checkForPrimeOcclusion();
-        state = DRY_SELF_TESTS_COMPLETE_STATE;
+        if ( FALSE == checkForPrimeOcclusion() )  // transition to complete state only when occlusion is removed
+        {
+            // clear the occlusion alarm condition to allow user to resume
+            clearAlarmCondition( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION );  // Resume option will appear
+            state = DRY_SELF_TESTS_COMPLETE_STATE;
+        }
     }
 
-    if ( TRUE == doesAlarmStatusIndicateStop() )
+    if ( ( TRUE == doesAlarmStatusIndicateStop() ) && ( FALSE == isAlarmActive( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION ) ) )
     {
         state = DRY_SELF_TESTS_STOPPED_STATE;
         setupForSelfTestsStop();