1 files changed, 11 insertions, 3 deletions
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index 6d20e6ed78..f316bc46ef 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -1,5 +1,5 @@
-require 'test_helper'
-require_relative './common'
+require "test_helper"
+require_relative "./common"
 
 class EventedRedisAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest
@@ -12,10 +12,18 @@ class EventedRedisAdapterTest < ActionCable::TestCase
   end
 
   def teardown
+    super
+
+    # Ensure EM is shut down before we re-enable warnings
+    EventMachine.reactor_thread.tap do |thread|
+      EventMachine.stop
+      thread.join
+    end
+
     $VERBOSE = @previous_verbose
   end
 
   def cable_config
-    { adapter: 'evented_redis', url: 'redis://127.0.0.1:6379/12' }
+    { adapter: "evented_redis", url: "redis://127.0.0.1:6379/12" }
   end
 end