diff --git a/bsp_hosted/fsfwconfig/OBSWConfig.h b/bsp_hosted/fsfwconfig/OBSWConfig.h
index 9e11424b..edfa1bca 100644
--- a/bsp_hosted/fsfwconfig/OBSWConfig.h
+++ b/bsp_hosted/fsfwconfig/OBSWConfig.h
@@ -6,9 +6,10 @@
 #ifndef CONFIG_OBSWCONFIG_H_
 #define CONFIG_OBSWCONFIG_H_
 
-#define ADD_TEST_FOLDER 	1
+#define OBSW_ADD_TEST_CODE      0
 
-// Define not used yet, PUS stack and TMTC tasks are always started
-#define ADD_PUS_STACK 		1
+// These defines should be disabled for mission code but are useful for
+// debugging.
+#define OBSW_ENHANCED_PRINTOUT  1
 
 #endif /* CONFIG_OBSWCONFIG_H_ */
diff --git a/fsfwconfig/OBSWConfig.h b/fsfwconfig/OBSWConfig.h
index 6d181093..d8784551 100644
--- a/fsfwconfig/OBSWConfig.h
+++ b/fsfwconfig/OBSWConfig.h
@@ -6,9 +6,10 @@
 #ifndef FSFWCONFIG_OBSWCONFIG_H_
 #define FSFWCONFIG_OBSWCONFIG_H_
 
-#define OBSW_ADD_TEST_CODE   	0
+#define OBSW_ADD_TEST_CODE      0
 
-// Define not used yet, PUS stack and TMTC tasks are always started
-#define ADD_PUS_STACK 		1
+// These defines should be disabled for mission code but are useful for
+// debugging.
+#define OBSW_ENHANCED_PRINTOUT  1
 
 #endif /* FSFWCONFIG_OBSWCONFIG_H_ */