diff --git a/app/jobs/welcome_enterprise_job.rb b/app/jobs/welcome_enterprise_job.rb
index 6665af9d5a..a936514ef9 100644
--- a/app/jobs/welcome_enterprise_job.rb
+++ b/app/jobs/welcome_enterprise_job.rb
@@ -1,5 +1,5 @@
-WelcomeEnterpriseJob = Struct.new(:enterprise_id) do
-  def perform
+class WelcomeEnterpriseJob < ActiveJob::Base
+  def perform(enterprise_id)
     enterprise = Enterprise.find enterprise_id
     EnterpriseMailer.welcome(enterprise).deliver
   end
diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index 5e55dd0f9a..7d64eccac6 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -400,7 +400,7 @@ class Enterprise < ActiveRecord::Base
   end
 
   def send_welcome_email
-    Delayed::Job.enqueue WelcomeEnterpriseJob.new(id)
+    WelcomeEnterpriseJob.perform_later(id)
   end
 
   def strip_url(url)
diff --git a/config/application.rb b/config/application.rb
index 9377984296..b0de90dfb4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -199,5 +199,7 @@ module Openfoodnetwork
     config.assets.precompile += ['*.jpg', '*.jpeg', '*.png', '*.gif' '*.svg']
 
     config.active_support.escape_html_entities_in_json = true
+
+    config.active_job.queue_adapter = :delayed_job
   end
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index d6ea342589..f84b7f5f7f 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -51,6 +51,8 @@ Openfoodnetwork::Application.configure do
   require 'open_food_network/rack_request_blocker'
   # Make sure the middleware is inserted first in middleware chain
   config.middleware.insert_before('ActionDispatch::Static', 'RackRequestBlocker')
+
+  config.active_job.queue_adapter = :test
 end
 
 # Allows us to use _url helpers in Rspec
diff --git a/spec/jobs/welcome_enterprise_job_spec.rb b/spec/jobs/welcome_enterprise_job_spec.rb
index a41322d185..6cdb295e49 100644
--- a/spec/jobs/welcome_enterprise_job_spec.rb
+++ b/spec/jobs/welcome_enterprise_job_spec.rb
@@ -8,6 +8,6 @@ describe WelcomeEnterpriseJob do
     expect(EnterpriseMailer).to receive(:welcome).with(enterprise).and_return(mail)
     expect(mail).to receive(:deliver)
 
-    run_job WelcomeEnterpriseJob.new(enterprise.id)
+    WelcomeEnterpriseJob.perform_now(enterprise.id)
   end
 end