Index: firmware/App/Services/SystemCommTD.c
===================================================================
diff -u -r395522dffef1348e176564925656012f529c1910 -r15776e2507d9255999a4c970af60cf8e81609095
--- firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision 395522dffef1348e176564925656012f529c1910)
+++ firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision 15776e2507d9255999a4c970af60cf8e81609095)
@@ -255,7 +255,7 @@
 //            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
             {
-#ifndef TEST_UI_ONLY
+#ifndef TEST_DISABLE_UI_ALARMS
                 activateAlarmNoData( ALARM_ID_TD_UI_COMM_TIMEOUT );
 #endif
             }
Index: firmware/App/TDCommon.h
===================================================================
diff -u -r60a07accf741b254afbbfe43ebe919728ec3c767 -r15776e2507d9255999a4c970af60cf8e81609095
--- firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 60a07accf741b254afbbfe43ebe919728ec3c767)
+++ firmware/App/TDCommon.h	(.../TDCommon.h)	(revision 15776e2507d9255999a4c970af60cf8e81609095)
@@ -37,6 +37,7 @@
 //    #define TEST_DEBUGGER                   1           // Testing with debugger - prevents FPGA comm alarms caused by breakpoints
 //    #define TEST_PROCESS_TASKS_WO_UI        1           // Allow task processing even when UI not connected
 //    #define TEST_UI_ONLY                    1           // Alpha test with TD and UI only - no DD
+      #define TEST_DISABLE_UI_ALARMS          1           // Disable UI alarms
 //    #define TEST_USE_OFF_AS_STOP_BUTTON     1           // Alpha test re-purposing off button as a stop button
     #define TEST_NO_PRESSURE_CHECKS         1             // Alpha test with no pressure sensor checks
 //    #define TEST_NO_STOP_CONSUME_CHECK      1           // Alpha test with no check for stop button timeout
Index: firmware/App/Tasks/TaskBG.c
===================================================================
diff -u -r395522dffef1348e176564925656012f529c1910 -r15776e2507d9255999a4c970af60cf8e81609095
--- firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 395522dffef1348e176564925656012f529c1910)
+++ firmware/App/Tasks/TaskBG.c	(.../TaskBG.c)	(revision 15776e2507d9255999a4c970af60cf8e81609095)
@@ -59,7 +59,7 @@
         // Wait for UI to come up after power up
         if ( FALSE == uiCommunicated() )
         {
-#ifndef BOARD_WITH_NO_HARDWARE
+#ifndef TEST_DISABLE_UI_ALARMS
             // Check timeout waiting for UI to check in (via CAN) after startup.
             if ( TRUE == didTimeout( startUICommTimeout, MAX_TIME_FOR_UI_TO_COMMUNICATE_MS ) )
             {