diff --git a/apps/dashboard/config/environments/development.rb b/apps/dashboard/config/environments/development.rb
index cef099bb7a..9fbc200559 100644
--- a/apps/dashboard/config/environments/development.rb
+++ b/apps/dashboard/config/environments/development.rb
@@ -60,4 +60,7 @@
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  config.active_job.queue_adapter = ActiveJob::QueueAdapters::AsyncAdapter.new \
+    min_threads: 1, max_threads: 1
 end
diff --git a/apps/dashboard/config/environments/production.rb b/apps/dashboard/config/environments/production.rb
index 5d6ec25a29..6cbab52eb9 100644
--- a/apps/dashboard/config/environments/production.rb
+++ b/apps/dashboard/config/environments/production.rb
@@ -86,5 +86,6 @@
 
   # Do not dump schema after migrations.
   # config.active_record.dump_schema_after_migration = false
-
+  config.active_job.queue_adapter = ActiveJob::QueueAdapters::AsyncAdapter.new \
+    min_threads: 1, max_threads: 1
 end
diff --git a/apps/dashboard/config/environments/test.rb b/apps/dashboard/config/environments/test.rb
index 30587ef6d5..aa5b2a1557 100644
--- a/apps/dashboard/config/environments/test.rb
+++ b/apps/dashboard/config/environments/test.rb
@@ -26,7 +26,10 @@
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment.
-  config.action_controller.allow_forgery_protection = false
+  # FIXME: normally this is disabled, we enable it because our code actually assumes it will
+  # be enabled (and thus system tests fail when it is disabled)
+  #
+  # config.action_controller.allow_forgery_protection = false
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
@@ -39,4 +42,7 @@
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+  #
+  config.active_job.queue_adapter = ActiveJob::QueueAdapters::AsyncAdapter.new \
+    min_threads: 1, max_threads: 1
 end