diff --git a/lib/puppet/indirector/catalog/queue.rb b/lib/puppet/indirector/catalog/queue.rb
new file mode 100644
index 000000000..85d2f8df5
--- /dev/null
+++ b/lib/puppet/indirector/catalog/queue.rb
@@ -0,0 +1,5 @@
+require 'puppet/node/catalog'
+require 'puppet/indirector/queue'
+
+class Puppet::Node::Catalog::Queue < Puppet::Indirector::Queue
+end
diff --git a/spec/unit/indirector/catalog/queue.rb b/spec/unit/indirector/catalog/queue.rb
new file mode 100755
index 000000000..e47af3126
--- /dev/null
+++ b/spec/unit/indirector/catalog/queue.rb
@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+require 'puppet/indirector/catalog/queue'
+
+describe Puppet::Node::Catalog::Queue do
+    it 'should be a subclass of the Queue terminus' do
+        Puppet::Node::Catalog::Queue.superclass.should equal(Puppet::Indirector::Queue)
+    end
+
+    it 'should be registered with the catalog store indirection' do
+        indirection = Puppet::Indirector::Indirection.instance(:catalog)
+        Puppet::Node::Catalog::Queue.indirection.should equal(indirection)
+    end
+
+    it 'shall be dubbed ":queue"' do
+        Puppet::Node::Catalog::Queue.name.should == :queue
+    end
+end