diff --git a/activejob/Rakefile b/activejob/Rakefile
index 85fc1970f843c..0529c24a7d2e5 100644
--- a/activejob/Rakefile
+++ b/activejob/Rakefile
@@ -36,8 +36,9 @@ namespace :test do
     Rake::TestTask.new(adapter => "test:env:#{adapter}") do |t|
       t.description = "Run adapter tests for #{adapter}"
       t.libs << "test"
-      t.test_files = FileList["test/cases/**/*_test.rb"].reject {
-        |x| x.include?("delayed_job") && adapter != "delayed_job"
+      t.test_files = FileList["test/cases/**/*_test.rb"].reject { |x|
+        (x.include?("delayed_job") && adapter != "delayed_job") ||
+          (x.include?("async") && adapter != "async")
       }
       t.verbose = true
       t.warning = true
@@ -46,8 +47,9 @@ namespace :test do
 
     namespace :isolated do
       task adapter => "test:env:#{adapter}" do
-        Dir.glob("#{__dir__}/test/cases/**/*_test.rb").reject {
-          |x| x.include?("delayed_job") && adapter != "delayed_job"
+        Dir.glob("#{__dir__}/test/cases/**/*_test.rb").reject { |x|
+          (x.include?("delayed_job") && adapter != "delayed_job") ||
+            (x.include?("async") && adapter != "async")
         }.all? do |file|
           sh(Gem.ruby, "-w", "-I#{__dir__}/lib", "-I#{__dir__}/test", file)
         end || raise("Failures")
diff --git a/activejob/lib/active_job/queue_adapters/async_adapter.rb b/activejob/lib/active_job/queue_adapters/async_adapter.rb
index b603cad80e08e..8f8e8f2503f5d 100644
--- a/activejob/lib/active_job/queue_adapters/async_adapter.rb
+++ b/activejob/lib/active_job/queue_adapters/async_adapter.rb
@@ -95,7 +95,7 @@ def enqueue(job, queue_name:)
 
         def enqueue_at(job, timestamp, queue_name:)
           delay = timestamp - Time.current.to_f
-          if delay > 0
+          if !immediate && delay > 0
             Concurrent::ScheduledTask.execute(delay, args: [job], executor: executor, &:perform)
           else
             enqueue(job, queue_name: queue_name)
diff --git a/activejob/test/cases/async_adapter_test.rb b/activejob/test/cases/async_adapter_test.rb
new file mode 100644
index 0000000000000..de4df9281663d
--- /dev/null
+++ b/activejob/test/cases/async_adapter_test.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "helper"
+require "active_job/queue_adapters/async_adapter"
+require "jobs/hello_job"
+
+class AsyncAdapterTest < ActiveSupport::TestCase
+  setup do
+    JobBuffer.clear
+    ActiveJob::Base.queue_adapter.immediate = true
+  end
+
+  test "in immediate run, perform_later runs immediately" do
+    HelloJob.perform_later "Alex"
+    assert_match(/Alex/, JobBuffer.last_value)
+  end
+
+  test "in immediate run, enqueue with wait: runs immediately" do
+    HelloJob.set(wait_until: Date.tomorrow.noon).perform_later "Alex"
+    assert_match(/Alex/, JobBuffer.last_value)
+  end
+end
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
index c30c609282b96..2f12b71c71ab0 100644
--- a/activejob/test/cases/logging_test.rb
+++ b/activejob/test/cases/logging_test.rb
@@ -280,8 +280,8 @@ def test_enqueue_retry_logging_on_retry_job
   def test_retry_stopped_logging
     perform_enqueued_jobs do
       RetryJob.perform_later "CustomCatchError", 6
-      assert_match(/Stopped retrying RetryJob \(Job ID: .*?\) due to a CustomCatchError.*, which reoccurred on \d+ attempts\./, @logger.messages)
     end
+    assert_match(/Stopped retrying RetryJob \(Job ID: .*?\) due to a CustomCatchError.*, which reoccurred on \d+ attempts\./, @logger.messages)
   end
 
   def test_retry_stopped_logging_without_block
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index 353e6f6f7d108..98ec564e8ac57 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -19,3 +19,7 @@
 require "active_support/testing/autorun"
 
 require_relative "../../tools/test_common"
+
+def adapter_is?(*adapter_class_symbols)
+  adapter_class_symbols.map(&:to_s).include? ActiveJob::Base.queue_adapter_name
+end
diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb
index d8931a74edaba..69b8bc2672722 100644
--- a/activejob/test/support/integration/test_case_helpers.rb
+++ b/activejob/test/support/integration/test_case_helpers.rb
@@ -27,10 +27,6 @@ def clear_jobs
       jobs_manager.clear_jobs
     end
 
-    def adapter_is?(*adapter_class_symbols)
-      adapter_class_symbols.map(&:to_s).include? ActiveJob::Base.queue_adapter_name
-    end
-
     def wait_for_jobs_to_finish_for(seconds = 60)
       Timeout.timeout(seconds) do
         while !job_executed do