diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/chconf.h
index 457751050..1e9c0e3ba 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/chconf.h
@@ -187,7 +187,7 @@
  * @note    The default is @p TRUE.
  */
 #if !defined(CH_CFG_USE_TIMESTAMP)
-#define CH_CFG_USE_TIMESTAMP                TRUE
+#define CH_CFG_USE_TIMESTAMP                FALSE
 #endif
 
 /**
diff --git a/readme.txt b/readme.txt
index 7f8fe074a..f10369fe3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -102,6 +102,8 @@
        ARMv7-M and ARMv8-M-ML.
 - NEW: On STM32WBxx added a check on STM32_LSI_ENABLE required by IWDG.
 - NEW: Added SPIv2 support also to STM32WB and STM32WL.
+- FIX: Fixed RT test suite build fails when CH_CFG_USE_TIMESTAMP is FALSE
+       (bug #1205)(backported to 21.11.1).
 - FIX: Fixed wrong number of CAN filters for STM32L496/9A6 (bug #1204)
        (backported to 20.3.5)(backported to 21.11.1).
 - FIX: Fixed DMA stream not disabled in STM32 QUADSPIv1 driver (bug #1203)
diff --git a/test/rt/configuration.xml b/test/rt/configuration.xml
index 6912022c3..99aefee21 100644
--- a/test/rt/configuration.xml
+++ b/test/rt/configuration.xml
@@ -821,7 +821,7 @@ test_assert(b == false, "in range");
           related to time stamps.</value>
       </description>
       <condition>
-        <value />
+        <value><![CDATA[CH_CFG_USE_TIMESTAMP == TRUE]]></value>
       </condition>
       <shared_code>
         <value><![CDATA[#include "ch.h"]]></value>
diff --git a/test/rt/source/test/rt_test_root.c b/test/rt/source/test/rt_test_root.c
index 0ea599684..4720effed 100644
--- a/test/rt/source/test/rt_test_root.c
+++ b/test/rt/source/test/rt_test_root.c
@@ -57,7 +57,9 @@ const testsequence_t * const rt_test_suite_array[] = {
   &rt_test_sequence_001,
   &rt_test_sequence_002,
   &rt_test_sequence_003,
+#if (CH_CFG_USE_TIMESTAMP == TRUE) || defined(__DOXYGEN__)
   &rt_test_sequence_004,
+#endif
   &rt_test_sequence_005,
   &rt_test_sequence_006,
 #if (CH_CFG_USE_SEMAPHORES == TRUE) || defined(__DOXYGEN__)
diff --git a/test/rt/source/test/rt_test_sequence_004.c b/test/rt/source/test/rt_test_sequence_004.c
index 4d9259507..15ede0c4e 100644
--- a/test/rt/source/test/rt_test_sequence_004.c
+++ b/test/rt/source/test/rt_test_sequence_004.c
@@ -29,11 +29,19 @@
  * This sequence tests the ChibiOS/RT functionalities related to time
  * stamps.
  *
+ * <h2>Conditions</h2>
+ * This sequence is only executed if the following preprocessor condition
+ * evaluates to true:
+ * - CH_CFG_USE_TIMESTAMP == TRUE
+ * .
+ *
  * <h2>Test Cases</h2>
  * - @subpage rt_test_004_001
  * .
  */
 
+#if (CH_CFG_USE_TIMESTAMP == TRUE) || defined(__DOXYGEN__)
+
 /****************************************************************************
  * Shared code.
  ****************************************************************************/
@@ -104,3 +112,5 @@ const testsequence_t rt_test_sequence_004 = {
   "Time Stamps Functionality",
   rt_test_sequence_004_array
 };
+
+#endif /* CH_CFG_USE_TIMESTAMP == TRUE */