1 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb
index 1538157995..3aa88c2caa 100644
--- a/actioncable/test/subscription_adapter/common.rb
+++ b/actioncable/test/subscription_adapter/common.rb
@@ -11,7 +11,7 @@ module CommonSubscriptionAdapterTest
   def setup
     server = ActionCable::Server::Base.new
     server.config.cable = cable_config.with_indifferent_access
-    server.config.use_faye = ENV["FAYE"].present?
+    server.config.logger = Logger.new(StringIO.new).tap { |l| l.level = Logger::UNKNOWN }
 
     adapter_klass = server.config.pubsub_adapter
 
@@ -20,7 +20,7 @@ module CommonSubscriptionAdapterTest
   end
 
   def teardown
-    [@rx_adapter, @tx_adapter].uniq.each(&:shutdown)
+    [@rx_adapter, @tx_adapter].uniq.compact.each(&:shutdown)
   end
 
   def subscribe_as_queue(channel, adapter = @rx_adapter)