Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -r9ed40798a5f4779db8a07bb6e256f7de99660108 -r97324225f3a465c46b9cbfe4083814b0eb5576a6
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 9ed40798a5f4779db8a07bb6e256f7de99660108)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 97324225f3a465c46b9cbfe4083814b0eb5576a6)
@@ -200,8 +200,15 @@
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_OFF;
 
-    // Set PWM count zero to stop the logical rinse pump
-    setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    {
+        // Set PWM count zero to stop the logical rinse pump
+        setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT );
+    }
+    else
+    {
+        setValveState( D88_79_VALV, VALVE_STATE_CLOSED );
+    }
 
     return state;
 }
@@ -217,11 +224,18 @@
 {
     RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_ON;
 
-    F32 pwmPercent  = getF32OverrideValue( &rinsePumpPwmPercentage );
-    U32 pwmInCount  = (U32)( ( pwmPercent / RINSE_PUMP_MAX_PWM_PERCENT ) * RINSE_PUMP_PWM_IN_COUNT_MAX );
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    {
+        F32 pwmPercent  = getF32OverrideValue( &rinsePumpPwmPercentage );
+        U32 pwmInCount  = (U32)( ( pwmPercent / RINSE_PUMP_MAX_PWM_PERCENT ) * RINSE_PUMP_PWM_IN_COUNT_MAX );
 
-    // Turn on logical rinse pump with given PWM value
-    setRinsePumpPwmCount( D79_RINSE_PUMP, pwmInCount );
+        // Turn on logical rinse pump with given PWM value
+        setRinsePumpPwmCount( D79_RINSE_PUMP, pwmInCount );
+    }
+    else
+    {
+        setValveState( D88_79_VALV, VALVE_STATE_OPEN );
+    }
 
     return state;
 }