Index: firmware/App/Monitors/Buttons.c
===================================================================
diff -u -r036a75d76ab01912646a480b935d97187a231a19 -r079daac611a8eb3a34c0c43392a044a882461d30
--- firmware/App/Monitors/Buttons.c	(.../Buttons.c)	(revision 036a75d76ab01912646a480b935d97187a231a19)
+++ firmware/App/Monitors/Buttons.c	(.../Buttons.c)	(revision 079daac611a8eb3a34c0c43392a044a882461d30)
@@ -146,8 +146,13 @@
  *************************************************************************/
 void execButtons( void )
 {
+#ifndef TEST_USE_OFF_AS_STOP_BUTTON
     PIN_SIGNAL_STATE_T off = getCPLDOffButton();
     PIN_SIGNAL_STATE_T stop = getCPLDStopButton();
+#else
+    PIN_SIGNAL_STATE_T off = PIN_SIGNAL_LOW;
+    PIN_SIGNAL_STATE_T stop = getCPLDOffButton();
+#endif
 
     // Set current button states read from CPLD
     dataOffButtonState.data = ( off == PIN_SIGNAL_HIGH ? BUTTON_STATE_PRESSED : BUTTON_STATE_RELEASED );