Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rba62e6bc4d1e85d99d40675ed00ede7cdfb9b6ba -r511d3ffe16427c8f275d46fca1e3ff3fb83fe54a
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ba62e6bc4d1e85d99d40675ed00ede7cdfb9b6ba)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 511d3ffe16427c8f275d46fca1e3ff3fb83fe54a)
@@ -63,8 +63,9 @@
 #define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
 #define RESERVOIR_SETTLE_TIME_MS                            ( 4 *  MS_PER_SECOND )                  ///< Time allotted for reservoir to settle in ms.
 
-#define MAX_NO_CARTRIDGE_SELF_TEST_TIME                     30                                       ///< Maximum no cartridge self-test time (in seconds).
+#define MAX_NO_CARTRIDGE_SELF_TEST_TIME                     30                                      ///< Maximum no cartridge self-test time (in seconds).
 #define MAX_DRY_SELF_TEST_TIME                              ( 3 * SEC_PER_MIN )                     ///< Maximum dry self-test time (in seconds).
+#define CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS            ( 10 * MS_PER_SECOND )                  ///< Time (in ms) required to wait for occlusion pressure to settle after cartridge insertion.
 
 #define SELF_TEST_TIME_DATA_PUB_INTERVAL                    ( MS_PER_SECOND )                       ///< Interval (ms/task time) at which self-test time data is published on the CAN bus.
 
@@ -382,12 +383,17 @@
     switch ( currentDrySelfTestsState )
     {
         case DRY_SELF_TESTS_START_STATE:
+            // Ensure occlusion sensor has time to settle after cartridge insertion before starting dry self-tests
+            if ( TRUE == didTimeout( selfTestStartTime, CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ) )
+            {
+                setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed.
 #ifdef SKIP_DRY_SELF_TESTS
-            // TODO: Remove once dry self-test is ready to use
-            currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+                // TODO: Remove once dry self-test is ready to use
+                currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
 #else
-            currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+                currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
 #endif
+            }
             break;
 
         case DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE:
@@ -830,7 +836,6 @@
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedCartridgeCheckState( void )
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
-
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
     if ( ( BUBBLE_DETECTED == ADVBubbleStatus ) &&