diff --git a/app/jobs/confirm_signup_job.rb b/app/jobs/confirm_signup_job.rb
deleted file mode 100644
index 8f3a9cd66a..0000000000
--- a/app/jobs/confirm_signup_job.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-class ConfirmSignupJob < ActiveJob::Base
-  def perform(user_id)
-    user = Spree::User.find user_id
-    Spree::UserMailer.signup_confirmation(user).deliver_now
-  end
-end
diff --git a/app/models/spree/user.rb b/app/models/spree/user.rb
index 089175595b..8d6f4add10 100644
--- a/app/models/spree/user.rb
+++ b/app/models/spree/user.rb
@@ -101,7 +101,7 @@ module Spree
     end
 
     def send_signup_confirmation
-      ConfirmSignupJob.perform_later(id)
+      Spree::UserMailer.signup_confirmation(self).deliver_later
     end
 
     def associate_customers
diff --git a/spec/jobs/confirm_signup_job_spec.rb b/spec/jobs/confirm_signup_job_spec.rb
deleted file mode 100644
index 7c42ad472c..0000000000
--- a/spec/jobs/confirm_signup_job_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe ConfirmSignupJob do
-  let(:user) { create(:user) }
-
-  it "sends a confirmation email to the user" do
-    mail = double(:mail)
-    expect(Spree::UserMailer).to receive(:signup_confirmation).with(user).and_return(mail)
-    expect(mail).to receive(:deliver_now)
-
-    ConfirmSignupJob.perform_now(user.id)
-  end
-end
diff --git a/spec/models/spree/user_spec.rb b/spec/models/spree/user_spec.rb
index dcf8805ea9..2c827962d0 100644
--- a/spec/models/spree/user_spec.rb
+++ b/spec/models/spree/user_spec.rb
@@ -111,7 +111,9 @@ describe Spree::User do
 
       expect do
         create(:user, confirmed_at: nil).confirm
-      end.to enqueue_job ConfirmSignupJob
+      end.to enqueue_job ActionMailer::DeliveryJob
+
+      expect(enqueued_jobs.last.to_s).to match "signup_confirmation"
     end
   end