diff --git a/tests/test_hwtimer_spin/main.c b/tests/test_hwtimer_spin/main.c
index 1677f5ae54..a93f67d23f 100644
--- a/tests/test_hwtimer_spin/main.c
+++ b/tests/test_hwtimer_spin/main.c
@@ -31,10 +31,11 @@ int main(void)
 {
     puts("This is just a functionality test for hwtimer_spin.");
 
-    while (1) {
+    for (unsigned long r = 10000; r > 0; r--) {
         for (unsigned long i = 6; i > 0; i--) {
-            printf("wait %lu\n", i);
             hwtimer_wait(i);
         }
     }
+    puts("success");
+    return 0;
 }
diff --git a/tests/test_hwtimer_wait/main.c b/tests/test_hwtimer_wait/main.c
index 93d9d69214..be5d335e62 100644
--- a/tests/test_hwtimer_wait/main.c
+++ b/tests/test_hwtimer_wait/main.c
@@ -32,10 +32,11 @@ int main(void)
     puts("This is a regression test for a race condition in hwtimer_wait.");
     puts("When the race condition is hit, the timer will wait for a very very long time...");
 
-    while (1) {
+    for (unsigned long r = 10000; r > 0; r--) {
         for (unsigned long i = 256; i; i = i >> 1) {
-            printf("wait %lu\n", i);
             hwtimer_wait(i);
         }
     }
+    puts("success");
+    return 0;
 }