diff --git a/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm b/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm
new file mode 100644
index 00000000..f460cb0d
--- /dev/null
+++ b/Netdisco/lib/App/Netdisco/Daemon/JobQueue.pm
@@ -0,0 +1,20 @@
+package App::Netdisco::Daemon::JobQueue;
+
+use Dancer qw/:moose :syntax :script/;
+
+use Role::Tiny;
+use namespace::clean;
+
+with 'App::Netdisco::Daemon::JobQueue::'. setting('job_queue');
+
+requires qw/
+  jq_get
+  jq_getlocal
+  jq_queued
+  jq_lock
+  jq_defer
+  jq_complete
+  jq_insert
+/;
+
+true;
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm
index 7ef553f8..9601f1be 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm
@@ -6,8 +6,7 @@ use Try::Tiny;
 use Role::Tiny;
 use namespace::clean;
 
-with 'App::Netdisco::Daemon::JobQueue::'. setting('job_queue');
-requires qw/worker_type worker_name munge_action jq_defer jq_complete/;
+with 'App::Netdisco::Daemon::JobQueue';
 
 sub worker_body {
   my $self = shift;
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm
index d6b8abc3..80d368a6 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Manager.pm
@@ -5,8 +5,7 @@ use Dancer qw/:moose :syntax :script/;
 use Role::Tiny;
 use namespace::clean;
 
-with 'App::Netdisco::Daemon::JobQueue::'. setting('job_queue');
-requires qw/jq_get jq_getlocal jq_lock/;
+with 'App::Netdisco::Daemon::JobQueue';
 
 sub worker_begin {
   my $self = shift;
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm
index 448c2cbb..95a2ba59 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Common.pm
@@ -12,9 +12,6 @@ use NetAddr::IP::Lite ':lower';
 use Role::Tiny;
 use namespace::clean;
 
-with 'App::Netdisco::Daemon::JobQueue::'. setting('job_queue');
-requires qw/jq_queued jq_insert/;
-
 # queue a job for all devices known to Netdisco
 sub _walk_body {
   my ($self, $job_type, $job) = @_;
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
index fc840ddf..39742143 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller/Device.pm
@@ -13,9 +13,6 @@ use NetAddr::IP::Lite ':lower';
 use Role::Tiny;
 use namespace::clean;
 
-with 'App::Netdisco::Daemon::JobQueue::'. setting('job_queue');
-requires qw/jq_queued jq_insert/;
-
 # queue a discover job for all devices known to Netdisco
 sub discoverall {
   my ($self, $job) = @_;
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm
index 0b1e476e..e39671ff 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Scheduler.pm
@@ -6,8 +6,7 @@ use Algorithm::Cron;
 use Role::Tiny;
 use namespace::clean;
 
-with 'App::Netdisco::Daemon::JobQueue::'. setting('job_queue');
-requires 'jq_insert';
+with 'App::Netdisco::Daemon::JobQueue';
 
 sub worker_begin {
   my $self = shift;