diff --git a/linux/fsfwconfig/OBSWConfig.h.in b/linux/fsfwconfig/OBSWConfig.h.in
index 5d501eb6..f52b2f9a 100644
--- a/linux/fsfwconfig/OBSWConfig.h.in
+++ b/linux/fsfwconfig/OBSWConfig.h.in
@@ -39,8 +39,6 @@ debugging. */
 // Set to 1 if telecommands are received via the PDEC IP Core
 #define OBSW_TC_FROM_PDEC                           1
 
-#define TMTC_TEST_SETUP                             1
-
 #define OBSW_ENABLE_TIMERS                          1
 #define OBSW_ADD_STAR_TRACKER                       0
 #define OBSW_ADD_PLOC_SUPERVISOR                    0
@@ -53,6 +51,7 @@ debugging. */
 #define OBSW_ADD_TMP_DEVICES                        0
 #define OBSW_ADD_RAD_SENSORS                        0
 #define OBSW_ADD_SYRLINKS                           0
+#define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT       0
 
 #elif defined RASPBERRY_PI
 
@@ -79,6 +78,7 @@ debugging. */
 //! /* Can be used to switch device to NORMAL mode immediately */
 #define OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP    1
 #define OBSW_PRINT_MISSED_DEADLINES                 1
+
 // If this is enabled, all other SPI code should be disabled
 #define OBSW_ADD_TEST_CODE                          0
 #define OBSW_ADD_SPI_TEST_CODE                      0
diff --git a/mission/tmtc/CCSDSHandler.h b/mission/tmtc/CCSDSHandler.h
index 8203b807..3090c24e 100644
--- a/mission/tmtc/CCSDSHandler.h
+++ b/mission/tmtc/CCSDSHandler.h
@@ -89,13 +89,13 @@ class CCSDSHandler : public SystemObject,
   //! [EXPORT] : [COMMENT] Received action message with unknown action id
   static const ReturnValue_t COMMAND_NOT_IMPLEMENTED = MAKE_RETURN_CODE(0xA0);
 
-#if TMTC_TEST_SETUP == 0
+#if OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT == 1
   // syrlinks must not be transmitting more than 15 minutes (according to datasheet)
   static const uint32_t TRANSMITTER_TIMEOUT = 900000;  // 900000 ms = 15 min
 #else
-  // Set to high value when not sending via syrlinks
-  static const uint32_t TRANSMITTER_TIMEOUT = 86400000;  // 1 day
-#endif /* TMTC_TEST_SETUP == 0 */
+	// Set to high value when not sending via syrlinks
+	static const uint32_t TRANSMITTER_TIMEOUT = 86400000; // 1 day
+#endif /* OBSW_SYRLINKS_DOWNLINK == 0 */
 
   static const bool UP = true;
   static const bool DOWN = false;