diff --git a/docs/reports/STM32F103-72.txt b/docs/reports/STM32F103-72.txt
index 6572ff499..8dc298047 100644
--- a/docs/reports/STM32F103-72.txt
+++ b/docs/reports/STM32F103-72.txt
@@ -89,51 +89,51 @@ Settings: SYSCLK=72, ACR=0x12 (2 wait states)
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.1 (Benchmark, messages #1)
---- Score : 221785 msgs/S, 443570 ctxswc/S
+--- Score : 221821 msgs/S, 443642 ctxswc/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.2 (Benchmark, messages #2)
---- Score : 185682 msgs/S, 371364 ctxswc/S
+--- Score : 185713 msgs/S, 371426 ctxswc/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.3 (Benchmark, messages #3)
---- Score : 185682 msgs/S, 371364 ctxswc/S
+--- Score : 185713 msgs/S, 371426 ctxswc/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.4 (Benchmark, context switch)
---- Score : 696832 ctxswc/S
+--- Score : 696944 ctxswc/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.5 (Benchmark, threads, full cycle)
---- Score : 173577 threads/S
+--- Score : 173605 threads/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.6 (Benchmark, threads, create only)
---- Score : 222482 threads/S
+--- Score : 222517 threads/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.7 (Benchmark, mass reschedulation, 5 threads)
---- Score : 56945 reschedulations/S, 341670 ctxswc/S
+--- Score : 56954 reschedulations/S, 341724 ctxswc/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.8 (Benchmark, round robin context switching)
---- Score : 505212 reschedulations/S, 505212 ctxswc/S
+--- Score : 505288 reschedulations/S, 505288 ctxswc/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.9 (Benchmark, I/O Queues throughput)
---- Score : 474964 bytes/S
+--- Score : 475040 bytes/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.10 (Benchmark, virtual timers set/reset)
---- Score : 647444 timers/S
+--- Score : 647548 timers/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.11 (Benchmark, semaphores wait/signal)
---- Score : 833304 wait+signal/S
+--- Score : 833440 wait+signal/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.12 (Benchmark, mutexes lock/unlock)
---- Score : 586700 lock+unlock/S
+--- Score : 586792 lock+unlock/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.13 (Benchmark, RAM footprint)
diff --git a/test/test.c b/test/test.c
index 623545318..774ab774d 100644
--- a/test/test.c
+++ b/test/test.c
@@ -277,9 +277,6 @@ msg_t TestThread(void *p) {
   while (patterns[i]) {
     j = 0;
     while (patterns[i][j]) {
-#if DELAY_BETWEEN_TESTS > 0
-      chThdSleepMilliseconds(DELAY_BETWEEN_TESTS);
-#endif
       print_line();
       test_print("--- Test Case ");
       test_printn(i + 1);
@@ -288,6 +285,9 @@ msg_t TestThread(void *p) {
       test_print(" (");
       test_print(patterns[i][j]->gettest());
       test_println(")");
+#if DELAY_BETWEEN_TESTS > 0
+      chThdSleepMilliseconds(DELAY_BETWEEN_TESTS);
+#endif
       execute_test(patterns[i][j]);
       if (local_fail) {
         test_print("--- Result: FAILURE (#");
diff --git a/test/test.h b/test/test.h
index c31caf633..500ffa6bd 100644
--- a/test/test.h
+++ b/test/test.h
@@ -33,7 +33,7 @@
 
 #if defined(CH_ARCHITECTURE_AVR) || defined(CH_ARCHITECTURE_MSP430)
 #define THREADS_STACK_SIZE      48
-#elif defined(CH_ARCHITECTURE_WIN32SIM)
+#elif defined(CH_ARCHITECTURE_SIMIA32)
 #define THREADS_STACK_SIZE      512
 #else
 #define THREADS_STACK_SIZE      128