Index: leahi_dialin/dd/modules/dd_test_configs.py
===================================================================
diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -ra5e55ec350051bc5b18989286b1c19f186328c07
--- leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
+++ leahi_dialin/dd/modules/dd_test_configs.py	(.../dd_test_configs.py)	(revision a5e55ec350051bc5b18989286b1c19f186328c07)
@@ -91,6 +91,12 @@
         @param reset: (int) 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
         """
+        if reset == NO_RESET and \
+            config in [DDFPTestConfigOptions.TEST_CONFIG_FP_ENABLE_DEFEATURE, DDFPTestConfigOptions.TEST_CONFIG_FP_ENABLE_BOOST_PUMP] and \
+            (self.dd_test_configs[DDFPTestConfigOptions.TEST_CONFIG_FP_ENABLE_DEFEATURE] == 1 or self.dd_test_configs[DDFPTestConfigOptions.TEST_CONFIG_FP_ENABLE_BOOST_PUMP] == 1):
+            self.logger.info('Boost pump and defeatured test configs are mutually exclusive, can\'t activate them while on of them is active')
+            return 0
+
         reset_value = integer_to_bytearray(reset)
         c = integer_to_bytearray(config)
         payload = reset_value + c