diff --git a/test/test_cli.rb b/test/test_cli.rb
index 4710b7ce60..d78bae410d 100644
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@@ -26,6 +26,9 @@ def setup
 
   def wait_booted
     @wait.sysread 1
+  rescue Errno::EAGAIN
+    sleep 0.001
+    retry
   end
 
   def teardown
diff --git a/test/test_thread_pool.rb b/test/test_thread_pool.rb
index 4166d71bb4..6d6befec3e 100644
--- a/test/test_thread_pool.rb
+++ b/test/test_thread_pool.rb
@@ -145,8 +145,7 @@ def test_autotrim
     end
 
     start = Time.now
-    Thread.pass until pool.spawned == 1 ||
-      Time.now - start > 1
+    Thread.pass until pool.spawned == 1 || Time.now - start > 1
 
     assert_equal 1, pool.spawned
   end
@@ -211,8 +210,7 @@ def test_auto_reap_dead_threads
     pool << 2
 
     start = Time.now
-    Thread.pass until pool.spawned == 0 ||
-      Time.now - start > 1
+    Thread.pass until pool.spawned == 0 || Time.now - start > 1
 
     assert_equal 0, pool.spawned
   end