diff --git a/test/test_cli.rb b/test/test_cli.rb
index 995ad3cf..95bbd50b 100644
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@@ -63,7 +63,7 @@ class TestCLI < Minitest::Test
   end
 
   def test_control_for_ssl
-    skip :jruby # Hangs on CI, TODO fix
+    skip_on :jruby # Hangs on CI, TODO fix
     require "net/http"
     control_port = UniquePort.call
     control_host = "127.0.0.1"
@@ -94,8 +94,8 @@ class TestCLI < Minitest::Test
     assert_equal([:started_at, :backlog, :running, :pool_capacity, :max_threads, :requests_count], Puma.stats.keys)
 
   ensure
-    cli.launcher.stop
-    t.join
+    cli.launcher.stop if cli
+    t.join if t
   end
 
   def test_control_clustered