Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r4e6093159809ef2ddc39d88401390caebe7fa293 -r5892086c904c06dbdc15cb4b35749060e16c1c0a
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4e6093159809ef2ddc39d88401390caebe7fa293)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 5892086c904c06dbdc15cb4b35749060e16c1c0a)
@@ -74,7 +74,8 @@
 #define WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE       0.05F                                   ///< Tolerance on integrated volume as a percentage (5%).
 #define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           20.0F                                   ///< Tolerance on integrated volume in grams.
 #define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              20.0F                                   ///< Tolerance in the load cell readings of the displacement in grams.
-#define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
+#define WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS            ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms (first).
+#define WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS           ( 30 * MS_PER_SECOND )                  ///< Time to displace dialysate in wet self-test in ms (second).
 #define RESERVOIR_SETTLE_TIME_MS                            ( 5 *  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).
@@ -1700,10 +1701,10 @@
         // This is not a volume for now and it is a flow rate.
         fmdIntegratedVolume += getMeasuredDialInFlowRate();
 
-        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_DISPLACEMENT_TIME_MS ) )
+        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
-            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_DISPLACEMENT_TIME_MS ) );
+            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) );
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE;
         }
@@ -1842,10 +1843,10 @@
     {
         fmdIntegratedVolume += getMeasuredDialInFlowRate();
 
-        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_DISPLACEMENT_TIME_MS ) )
+        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
-            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_DISPLACEMENT_TIME_MS ) );
+            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) );
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE;
         }