Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r764c4865feb788998136c6129a7ec656b563047d -ra950dac5fd5cfbbc52c82efb512c6c36a4ab30f3
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 764c4865feb788998136c6129a7ec656b563047d)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a950dac5fd5cfbbc52c82efb512c6c36a4ab30f3)
@@ -78,7 +78,7 @@
 #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_DRY_SELF_TEST_TIME                              ( 3 * SEC_PER_MIN )                     ///< Maximum dry self-test time (in seconds).
+#define MAX_DRY_SELF_TEST_TIME                              ( 12 * 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.
@@ -523,6 +523,7 @@
     // Publish current self-test time data
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
+        if currentDrySelfTestsState
         U32 const elapsedSelfTestTimeInSecs = calcTimeSince( selfTestStartTime ) / MS_PER_SECOND;
 
         selfTestPreviousPublishDataTime = getMSTimerCount();