5 files changed, 33 insertions, 8 deletions
diff --git a/tests/thread/thread_exc1.py b/tests/thread/thread_exc1.py
index 16483d777..cd8774092 100644
--- a/tests/thread/thread_exc1.py
+++ b/tests/thread/thread_exc1.py
@@ -25,7 +25,12 @@ n_finished = 0
 
 # spawn threads
 for i in range(n_thread):
-    _thread.start_new_thread(thread_entry, ())
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # busy wait for threads to finish
 while n_finished < n_thread:
diff --git a/tests/thread/thread_exit1.py b/tests/thread/thread_exit1.py
index c4a93c45a..186a9be34 100644
--- a/tests/thread/thread_exit1.py
+++ b/tests/thread/thread_exit1.py
@@ -13,8 +13,13 @@ def thread_entry():
     _thread.exit()
 
 
-_thread.start_new_thread(thread_entry, ())
-_thread.start_new_thread(thread_entry, ())
+for i in range(2):
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # wait for threads to finish
 time.sleep(1)
diff --git a/tests/thread/thread_exit2.py b/tests/thread/thread_exit2.py
index 0cd80e690..5be7945db 100644
--- a/tests/thread/thread_exit2.py
+++ b/tests/thread/thread_exit2.py
@@ -13,8 +13,13 @@ def thread_entry():
     raise SystemExit
 
 
-_thread.start_new_thread(thread_entry, ())
-_thread.start_new_thread(thread_entry, ())
+for i in range(2):
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # wait for threads to finish
 time.sleep(1)
diff --git a/tests/thread/thread_stacksize1.py b/tests/thread/thread_stacksize1.py
index 5d25509b7..cf46b73b7 100644
--- a/tests/thread/thread_stacksize1.py
+++ b/tests/thread/thread_stacksize1.py
@@ -41,7 +41,12 @@ n_finished = 0
 # set stack size and spawn a few threads
 _thread.stack_size(sz)
 for i in range(n_thread):
-    _thread.start_new_thread(thread_entry, ())
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # reset stack size to default (for subsequent scripts on baremetal)
 _thread.stack_size()
diff --git a/tests/thread/thread_start1.py b/tests/thread/thread_start1.py
index f0e696840..727463324 100644
--- a/tests/thread/thread_start1.py
+++ b/tests/thread/thread_start1.py
@@ -18,8 +18,13 @@ def thread_entry(n):
         foo()
 
 
-_thread.start_new_thread(thread_entry, (10,))
-_thread.start_new_thread(thread_entry, (20,))
+for i in range(2):
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ((i + 1) * 10,))
+            break
+        except OSError:
+            pass
 
 # wait for threads to finish
 time.sleep(1)