Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rba78a6ce8e6fae706146c36c361b6680b2657642 -ra5a547f5decf862cfeb2c952a5bd267a3af3cf5b
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision ba78a6ce8e6fae706146c36c361b6680b2657642)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision a5a547f5decf862cfeb2c952a5bd267a3af3cf5b)
@@ -511,21 +511,13 @@
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
         U32 const elapsedSelfTestTimeInSecs = calcTimeSince( selfTestStartTime ) / MS_PER_SECOND;
+        SELF_TEST_DRY_PAYLOAD_T data;
 
         selfTestPreviousPublishDataTime = getMSTimerCount();
 
-        if ( elapsedSelfTestTimeInSecs <= MAX_DRY_SELF_TEST_TIME )
-        {
-            SELF_TEST_DRY_PAYLOAD_T data;
-
-            data.timeout   = MAX_DRY_SELF_TEST_TIME;
-            data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
-            broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
-        }
-        else
-        {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT, currentDrySelfTestsState );
-        }
+        data.timeout   = MAX_DRY_SELF_TEST_TIME;
+        data.countdown = ( MAX_DRY_SELF_TEST_TIME - elapsedSelfTestTimeInSecs );
+        broadcastData( MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( SELF_TEST_DRY_PAYLOAD_T ) );
     }
 }