Index: TestSupport.c
===================================================================
diff -u -r5477852164955f5840473e8dcaa7573610294503 -r84116eb2eac6426f294626ecc0259296b8da52ce
--- TestSupport.c	(.../TestSupport.c)	(revision 5477852164955f5840473e8dcaa7573610294503)
+++ TestSupport.c	(.../TestSupport.c)	(revision 84116eb2eac6426f294626ecc0259296b8da52ce)
@@ -540,6 +540,12 @@
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_FPGA_INVALID_STATE, config )
             }
         }
+        else
+        {
+            // initialize FPGA registers to Beta 2.0
+            initFPGAPerHW( TRUE );
+        }
+
 #endif
     }
 
@@ -565,6 +571,13 @@
         testConfig[ config ] = TEST_CONFIG_DISABLE_KEY;
         status               = TRUE;
     }
+#ifdef _DD_
+        if ( config == TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW )
+        {
+            // initialize FPGA registers to Beta 1.9 or below
+            initFPGAPerHW( FALSE );
+        }
+#endif
 
     return status;
 }