3 files changed, 12 insertions, 2 deletions
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 58de2f2588..19a2820a6e 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -199,6 +199,14 @@ class EnqueuedJobsTest < ActiveJob::TestCase
 end
 
 class PerformedJobsTest < ActiveJob::TestCase
+  def test_performed_enqueue_jobs_with_only_option_doesnt_leak_outside_the_block
+    assert_equal nil, queue_adapter.filter
+    perform_enqueued_jobs only: HelloJob do
+      assert_equal HelloJob, queue_adapter.filter
+    end
+    assert_equal nil, queue_adapter.filter
+  end
+
   def test_assert_performed_jobs
     assert_nothing_raised do
       assert_performed_jobs 1 do
diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb
index 3a5b66a057..256ddb3cf3 100644
--- a/activejob/test/support/integration/adapters/qu.rb
+++ b/activejob/test/support/integration/adapters/qu.rb
@@ -3,7 +3,7 @@ module QuJobsManager
     require 'qu-rails'
     require 'qu-redis'
     ActiveJob::Base.queue_adapter = :qu
-    ENV['REDISTOGO_URL'] = "tcp://127.0.0.1:6379/12"
+    ENV['REDISTOGO_URL'] = "redis://127.0.0.1:6379/12"
     backend = Qu::Backend::Redis.new
     backend.namespace = "active_jobs_int_test"
     Qu.backend  = backend
diff --git a/activejob/test/support/integration/adapters/queue_classic.rb b/activejob/test/support/integration/adapters/queue_classic.rb
index 038473ccdc..f522b2711f 100644
--- a/activejob/test/support/integration/adapters/queue_classic.rb
+++ b/activejob/test/support/integration/adapters/queue_classic.rb
@@ -1,6 +1,7 @@
 module QueueClassicJobsManager
   def setup
     ENV['QC_DATABASE_URL'] ||= 'postgres:///active_jobs_qc_int_test'
+    ENV['QC_RAILS_DATABASE'] = 'false'
     ENV['QC_LISTEN_TIME']    = "0.5"
     uri = URI.parse(ENV['QC_DATABASE_URL'])
     user = uri.user||ENV['USER']
@@ -20,7 +21,8 @@ module QueueClassicJobsManager
   end
 
   def start_workers
-    QC::Conn.disconnect
+    QC.default_conn_adapter.disconnect
+    QC.default_conn_adapter = nil
     @pid = fork do
       worker = QC::Worker.new(q_name: 'integration_tests')
       worker.start