1 files changed, 10 insertions, 4 deletions
diff --git a/tests/thread/stress_create.py b/tests/thread/stress_create.py
index eda768fa7b..877424cdf5 100644
--- a/tests/thread/stress_create.py
+++ b/tests/thread/stress_create.py
@@ -1,9 +1,13 @@
 # stress test for creating many threads
 
 try:
-    import utime as time
+    import utime
+
+    sleep_ms = utime.sleep_ms
 except ImportError:
     import time
+
+    sleep_ms = lambda t: time.sleep(t / 1000)
 import _thread
 
 
@@ -16,9 +20,11 @@ while thread_num < 500:
     try:
         _thread.start_new_thread(thread_entry, (thread_num,))
         thread_num += 1
-    except MemoryError:
-        pass
+    except (MemoryError, OSError) as er:
+        # Cannot create a new thead at this stage, yield for a bit to
+        # let existing threads run to completion and free up resources.
+        sleep_ms(50)
 
 # wait for the last threads to terminate
-time.sleep(1)
+sleep_ms(500)
 print("done")