diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/.cproject b/demos/STM32/RT-STM32L476-DISCOVERY/.cproject
index 4d86467e8..5ccdc393c 100644
--- a/demos/STM32/RT-STM32L476-DISCOVERY/.cproject
+++ b/demos/STM32/RT-STM32L476-DISCOVERY/.cproject
@@ -51,4 +51,5 @@
 			<resource resourceType="PROJECT" workspacePath="/RT-STM32L476RG-NUCLEO"/>
 		</configuration>
 	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 </cproject>
diff --git a/testhal/STM32/multi/DAC/Makefile b/testhal/STM32/multi/DAC/Makefile
index 8c8afb227..ce09ce222 100644
--- a/testhal/STM32/multi/DAC/Makefile
+++ b/testhal/STM32/multi/DAC/Makefile
@@ -13,11 +13,11 @@ all:
 	@echo ====================================================================
 	@echo
 	@echo === Building for STM32L476-Discovery ===============================
-	+@make --no-print-directory -f ./make/stm32l476_discovery.make all
+	@make --no-print-directory -f ./make/stm32l476_discovery.make all
 	@echo ====================================================================
 	@echo
 	@echo === Building for STM32L4R5ZI-Nucleo144 =============================
-	+@make --no-print-directory -f ./make/stm32l4r5zi_nucleo144.make all
+	@make --no-print-directory -f ./make/stm32l4r5zi_nucleo144.make all
 	@echo ====================================================================
 	@echo
 
@@ -27,9 +27,9 @@ clean:
 	@echo
 	-@make --no-print-directory -f ./make/stm32h743_nucleo144.make clean
 	@echo
-	+@make --no-print-directory -f ./make/stm32l476_discovery.make clean
+	-@make --no-print-directory -f ./make/stm32l476_discovery.make clean
 	@echo
-	+@make --no-print-directory -f ./make/stm32l4r5zi_nucleo144.make clean
+	-@make --no-print-directory -f ./make/stm32l4r5zi_nucleo144.make clean
 	@echo
 
 #
diff --git a/testrt/IRQ_STORM/source/irq_storm.c b/testrt/IRQ_STORM/source/irq_storm.c
index c7cb4dfdf..9160fcbea 100644
--- a/testrt/IRQ_STORM/source/irq_storm.c
+++ b/testrt/IRQ_STORM/source/irq_storm.c
@@ -82,11 +82,9 @@ static thread_t *threads[IRQ_STORM_CFG_NUM_THREADS];
  * Test worker threads.
  */
 static THD_FUNCTION(irq_storm_thread, arg) {
-  static volatile unsigned x = 0;
   static unsigned cnt = 0;
   unsigned me = (unsigned)arg;
   unsigned target;
-  unsigned r;
   msg_t msg;
 
   chRegSetThreadName("irq_storm");
@@ -100,6 +98,9 @@ static THD_FUNCTION(irq_storm_thread, arg) {
 #if IRQ_STORM_CFG_RANDOMIZE != FALSE
    /* Pseudo-random delay.*/
    {
+     static volatile unsigned x = 0;
+     unsigned r;
+
      chSysLock();
      r = rand() & 15;
      chSysUnlock();
@@ -107,12 +108,7 @@ static THD_FUNCTION(irq_storm_thread, arg) {
        x++;
    }
 #else /* IRQ_STORM_CFG_RANDOMIZE == FALSE */
-   /* Fixed delay.*/
-   {
-     r = me >> 4;
-     while (r--)
-       x++;
-   }
+   /* No delay.*/
 #endif /* IRQ_STORM_CFG_RANDOMIZE == FALSE */
 
     /* Deciding in which direction to re-send the message.*/
diff --git a/testrt/IRQ_STORM/source/irq_storm.h b/testrt/IRQ_STORM/source/irq_storm.h
index 1e6aa26ef..6a91a4be3 100644
--- a/testrt/IRQ_STORM/source/irq_storm.h
+++ b/testrt/IRQ_STORM/source/irq_storm.h
@@ -33,22 +33,6 @@
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
 
-#ifndef RANDOMIZE
-#define RANDOMIZE       FALSE
-#endif
-
-#ifndef ITERATIONS
-#define ITERATIONS      100
-#endif
-
-#ifndef NUM_THREADS
-#define NUM_THREADS     4
-#endif
-
-#ifndef MAILBOX_SIZE
-#define MAILBOX_SIZE    4
-#endif
-
 /**
  * @name    Configuration options
  * @{
@@ -71,7 +55,7 @@
  * @brief   Number of storm threads.
  */
 #if !defined(IRQ_STORM_CFG_NUM_THREADS) || defined(__DOXYGEN__)
-#define IRQ_STORM_CFG_NUM_THREADS           4
+#define IRQ_STORM_CFG_NUM_THREADS           8
 #endif
 
 /**