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 );
Index: firmware/App/TDCommon.h
===================================================================
diff -u -ra5560a2917aa62bcafd8e6a81041ace723237109 -r079daac611a8eb3a34c0c43392a044a882461d30
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision a5560a2917aa62bcafd8e6a81041ace723237109)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 079daac611a8eb3a34c0c43392a044a882461d30)
@@ -34,8 +34,9 @@
 //    #define TASK_TIMING_OUTPUT_ENABLED      1           // Re-purposes alarm lamp pins for task timing
 //    #define TEST_AIR_TRAP_ALPHA_TESTING     1           // Alpha unit air trap testing
 //    #define TEST_PINCH_VALVES               1           // Alpha unit pinch valve testing
-//    #define TEST_UI_ONLY                    1           // Alpha test with TD and UI only - no DD
-//    #define TEST_NO_PINCH_VALVES            1           // Alpha test with no pinch valve functionality
+    #define TEST_UI_ONLY                    1           // Alpha test with TD and UI only - no DD
+    #define TEST_NO_PINCH_VALVES            1           // Alpha test with no pinch valve functionality
+    #define TEST_USE_OFF_AS_STOP_BUTTON     1           // Alpha test re-purposing off button as a stop button
 
     #include <stdio.h>
     #include <strings.h>