diff --git a/lib/puppet/indirector/data_binding/hiera.rb b/lib/puppet/indirector/data_binding/hiera.rb
index 7fbc63782..e6e609d55 100644
--- a/lib/puppet/indirector/data_binding/hiera.rb
+++ b/lib/puppet/indirector/data_binding/hiera.rb
@@ -1,50 +1,7 @@
-require 'puppet/indirector/code'
+require 'puppet/indirector/hiera'
 require 'hiera/scope'
 
-class Puppet::DataBinding::Hiera < Puppet::Indirector::Code
+class Puppet::DataBinding::Hiera < Puppet::Indirector::Hiera
   desc "Retrieve data using Hiera."
-
-  def initialize(*args)
-    if ! Puppet.features.hiera?
-      raise "Hiera terminus not supported without hiera library"
-    end
-    super
-  end
-
-  if defined?(::Psych::SyntaxError)
-    DataBindingExceptions = [::StandardError, ::Psych::SyntaxError]
-  else
-    DataBindingExceptions = [::StandardError]
-  end
-
-  def find(request)
-    hiera.lookup(request.key, nil, Hiera::Scope.new(request.options[:variables]), nil, nil)
-  rescue *DataBindingExceptions => detail
-    raise Puppet::DataBinding::LookupError.new(detail.message, detail)
-  end
-
-  private
-
-  def self.hiera_config
-    hiera_config = Puppet.settings[:hiera_config]
-    config = {}
-
-    if Puppet::FileSystem.exist?(hiera_config)
-      config = Hiera::Config.load(hiera_config)
-    else
-      Puppet.warning "Config file #{hiera_config} not found, using Hiera defaults"
-    end
-
-    config[:logger] = 'puppet'
-    config
-  end
-
-  def self.hiera
-    @hiera ||= Hiera.new(:config => hiera_config)
-  end
-
-  def hiera
-    self.class.hiera
-  end
 end
 
diff --git a/lib/puppet/indirector/hiera.rb b/lib/puppet/indirector/hiera.rb
index b11c01cd6..a552d569b 100644
--- a/lib/puppet/indirector/hiera.rb
+++ b/lib/puppet/indirector/hiera.rb
@@ -1,48 +1,48 @@
 require 'puppet/indirector/terminus'
 require 'hiera/scope'
 
 class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   def initialize(*args)
     if ! Puppet.features.hiera?
       raise "Hiera terminus not supported without hiera library"
     end
     super
   end
 
   if defined?(::Psych::SyntaxError)
     DataBindingExceptions = [::StandardError, ::Psych::SyntaxError]
   else
     DataBindingExceptions = [::StandardError]
   end
 
   def find(request)
     hiera.lookup(request.key, nil, Hiera::Scope.new(request.options[:variables]), nil, nil)
   rescue *DataBindingExceptions => detail
     raise Puppet::DataBinding::LookupError.new(detail.message, detail)
   end
 
   private
 
   def self.hiera_config
     hiera_config = Puppet.settings[:hiera_config]
     config = {}
 
-    if File.exist?(hiera_config)
+    if Puppet::FileSystem.exist?(hiera_config)
       config = Hiera::Config.load(hiera_config)
     else
       Puppet.warning "Config file #{hiera_config} not found, using Hiera defaults"
     end
 
     config[:logger] = 'puppet'
     config
   end
 
   def self.hiera
     @hiera ||= Hiera.new(:config => hiera_config)
   end
 
   def hiera
     self.class.hiera
   end
 end
 
diff --git a/spec/unit/indirector/hiera_spec.rb b/spec/shared_behaviours/hiera_indirections.rb
similarity index 78%
copy from spec/unit/indirector/hiera_spec.rb
copy to spec/shared_behaviours/hiera_indirections.rb
index 832c2da79..ae0464246 100644
--- a/spec/unit/indirector/hiera_spec.rb
+++ b/spec/shared_behaviours/hiera_indirections.rb
@@ -1,108 +1,95 @@
-require 'spec_helper'
-require 'puppet/data_binding'
-require 'puppet/indirector/hiera'
-require 'hiera/backend'
-
-describe Puppet::Indirector::Hiera do
+shared_examples_for "Hiera indirection" do |test_klass, fixture_dir|
   include PuppetSpec::Files
 
-  module Testing
-    module DataBinding
-      class Hiera < Puppet::Indirector::Hiera
-      end
-    end
-  end
-
   def write_hiera_config(config_file, datadir)
     File.open(config_file, 'w') do |f|
       f.write("---
         :yaml:
           :datadir: #{datadir}
         :hierarchy: ['global', 'invalid']
         :logger: 'noop'
         :backends: ['yaml']
       ")
     end
   end
 
+  def request(key)
+    Puppet::Indirector::Request.new(:hiera, :find, key, nil)
+  end
+
   before do
     hiera_config_file = tmpfile("hiera.yaml")
     Puppet.settings[:hiera_config] = hiera_config_file
-    write_hiera_config(hiera_config_file, my_fixture_dir)
+    write_hiera_config(hiera_config_file, fixture_dir)
   end
 
   it "should be the default data_binding terminus" do
     Puppet.settings[:data_binding_terminus].should == :hiera
   end
 
   it "should raise an error if we don't have the hiera feature" do
     Puppet.features.expects(:hiera?).returns(false)
-    lambda { Testing::DataBinding::Hiera.new }.should raise_error RuntimeError,
+    lambda { test_klass.new }.should raise_error RuntimeError,
       "Hiera terminus not supported without hiera library"
   end
 
   describe "the behavior of the hiera_config method", :if => Puppet.features.hiera? do
     it "should override the logger and set it to puppet" do
-      Testing::DataBinding::Hiera.hiera_config[:logger].should == "puppet"
+      test_klass.hiera_config[:logger].should == "puppet"
     end
 
     context "when the Hiera configuration file does not exist" do
       let(:path) { File.expand_path('/doesnotexist') }
 
       before do
         Puppet.settings[:hiera_config] = path
       end
 
       it "should log a warning" do
         Puppet.expects(:warning).with(
          "Config file #{path} not found, using Hiera defaults")
-        Testing::DataBinding::Hiera.hiera_config
+        test_klass.hiera_config
       end
 
       it "should only configure the logger and set it to puppet" do
         Puppet.expects(:warning).with(
          "Config file #{path} not found, using Hiera defaults")
-        Testing::DataBinding::Hiera.hiera_config.should == { :logger => 'puppet' }
+        test_klass.hiera_config.should == { :logger => 'puppet' }
       end
     end
   end
 
   describe "the behavior of the find method", :if => Puppet.features.hiera? do
 
-    let(:data_binder) { Testing::DataBinding::Hiera.new }
+    let(:data_binder) { test_klass.new }
 
     it "should support looking up an integer" do
       data_binder.find(request("integer")).should == 3000
     end
 
     it "should support looking up a string" do
       data_binder.find(request("string")).should == 'apache'
     end
 
     it "should support looking up an array" do
       data_binder.find(request("array")).should == [
         '0.ntp.puppetlabs.com',
         '1.ntp.puppetlabs.com',
       ]
     end
 
     it "should support looking up a hash" do
       data_binder.find(request("hash")).should == {
         'user'  => 'Hightower',
         'group' => 'admin',
         'mode'  => '0644'
       }
     end
 
     it "raises a data binding error if hiera cannot parse the yaml data" do
       expect do
         data_binder.find(request('invalid'))
       end.to raise_error(Puppet::DataBinding::LookupError)
     end
   end
-
-  def request(key)
-    Puppet::Indirector::Request.new(:hiera, :find, key, nil)
-  end
 end
-
diff --git a/spec/unit/indirector/data_binding/hiera_spec.rb b/spec/unit/indirector/data_binding/hiera_spec.rb
index 7ab3b27fc..28d00e993 100644
--- a/spec/unit/indirector/data_binding/hiera_spec.rb
+++ b/spec/unit/indirector/data_binding/hiera_spec.rb
@@ -1,114 +1,23 @@
 require 'spec_helper'
 require 'puppet/indirector/data_binding/hiera'
 
 describe Puppet::DataBinding::Hiera do
-  include PuppetSpec::Files
-
-  def write_hiera_config(config_file, datadir)
-    File.open(config_file, 'w') do |f|
-      f.write("---
-        :yaml:
-          :datadir: #{datadir}
-        :hierarchy: ['global', 'invalid']
-        :logger: 'noop'
-        :backends: ['yaml']
-      ")
-    end
-  end
-
-  def request(key)
-    Puppet::Indirector::Request.new(:hiera, :find, key, nil)
-  end
-
-  before do
-    hiera_config_file = tmpfile("hiera.yaml")
-    Puppet.settings[:hiera_config] = hiera_config_file
-    write_hiera_config(hiera_config_file, my_fixture_dir)
-  end
-
   after do
     Puppet::DataBinding::Hiera.instance_variable_set(:@hiera, nil)
   end
 
   it "should have documentation" do
     Puppet::DataBinding::Hiera.doc.should_not be_nil
   end
 
   it "should be registered with the data_binding indirection" do
     indirection = Puppet::Indirector::Indirection.instance(:data_binding)
     Puppet::DataBinding::Hiera.indirection.should equal(indirection)
   end
 
   it "should have its name set to :hiera" do
     Puppet::DataBinding::Hiera.name.should == :hiera
   end
-  it "should be the default data_binding terminus" do
-    Puppet.settings[:data_binding_terminus].should == :hiera
-  end
-
-  it "should raise an error if we don't have the hiera feature" do
-    Puppet.features.expects(:hiera?).returns(false)
-    lambda { Puppet::DataBinding::Hiera.new }.should raise_error RuntimeError,
-      "Hiera terminus not supported without hiera library"
-  end
-
-  describe "the behavior of the hiera_config method", :if => Puppet.features.hiera? do
-    it "should override the logger and set it to puppet" do
-      Puppet::DataBinding::Hiera.hiera_config[:logger].should == "puppet"
-    end
-
-    context "when the Hiera configuration file does not exist" do
-      let(:path) { File.expand_path('/doesnotexist') }
 
-      before do
-        Puppet.settings[:hiera_config] = path
-      end
-
-      it "should log a warning" do
-        Puppet.expects(:warning).with(
-         "Config file #{path} not found, using Hiera defaults")
-        Puppet::DataBinding::Hiera.hiera_config
-      end
-
-      it "should only configure the logger and set it to puppet" do
-        Puppet.expects(:warning).with(
-         "Config file #{path} not found, using Hiera defaults")
-        Puppet::DataBinding::Hiera.hiera_config.should == { :logger => 'puppet' }
-      end
-    end
-  end
-
-  describe "the behavior of the find method", :if => Puppet.features.hiera? do
-
-    let(:data_binder) { Puppet::DataBinding::Hiera.new }
-
-    it "should support looking up an integer" do
-      data_binder.find(request("integer")).should == 3000
-    end
-
-    it "should support looking up a string" do
-      data_binder.find(request("string")).should == 'apache'
-    end
-
-    it "should support looking up an array" do
-      data_binder.find(request("array")).should == [
-        '0.ntp.puppetlabs.com',
-        '1.ntp.puppetlabs.com',
-      ]
-    end
-
-    it "should support looking up a hash" do
-      data_binder.find(request("hash")).should == {
-        'user'  => 'Hightower',
-        'group' => 'admin',
-        'mode'  => '0644'
-      }
-    end
-
-    it "raises a data binding error if hiera cannot parse the yaml data" do
-      expect do
-        data_binder.find(request('invalid'))
-      end.to raise_error(Puppet::DataBinding::LookupError)
-    end
-  end
+  it_should_behave_like "Hiera indirection", Puppet::DataBinding::Hiera, my_fixture_dir
 end
diff --git a/spec/unit/indirector/hiera_spec.rb b/spec/unit/indirector/hiera_spec.rb
index 832c2da79..f74fd29aa 100644
--- a/spec/unit/indirector/hiera_spec.rb
+++ b/spec/unit/indirector/hiera_spec.rb
@@ -1,108 +1,17 @@
 require 'spec_helper'
 require 'puppet/data_binding'
 require 'puppet/indirector/hiera'
 require 'hiera/backend'
 
 describe Puppet::Indirector::Hiera do
-  include PuppetSpec::Files
 
   module Testing
     module DataBinding
       class Hiera < Puppet::Indirector::Hiera
       end
     end
   end
 
-  def write_hiera_config(config_file, datadir)
-    File.open(config_file, 'w') do |f|
-      f.write("---
-        :yaml:
-          :datadir: #{datadir}
-        :hierarchy: ['global', 'invalid']
-        :logger: 'noop'
-        :backends: ['yaml']
-      ")
-    end
-  end
-
-  before do
-    hiera_config_file = tmpfile("hiera.yaml")
-    Puppet.settings[:hiera_config] = hiera_config_file
-    write_hiera_config(hiera_config_file, my_fixture_dir)
-  end
-
-  it "should be the default data_binding terminus" do
-    Puppet.settings[:data_binding_terminus].should == :hiera
-  end
-
-  it "should raise an error if we don't have the hiera feature" do
-    Puppet.features.expects(:hiera?).returns(false)
-    lambda { Testing::DataBinding::Hiera.new }.should raise_error RuntimeError,
-      "Hiera terminus not supported without hiera library"
-  end
-
-  describe "the behavior of the hiera_config method", :if => Puppet.features.hiera? do
-    it "should override the logger and set it to puppet" do
-      Testing::DataBinding::Hiera.hiera_config[:logger].should == "puppet"
-    end
-
-    context "when the Hiera configuration file does not exist" do
-      let(:path) { File.expand_path('/doesnotexist') }
-
-      before do
-        Puppet.settings[:hiera_config] = path
-      end
-
-      it "should log a warning" do
-        Puppet.expects(:warning).with(
-         "Config file #{path} not found, using Hiera defaults")
-        Testing::DataBinding::Hiera.hiera_config
-      end
-
-      it "should only configure the logger and set it to puppet" do
-        Puppet.expects(:warning).with(
-         "Config file #{path} not found, using Hiera defaults")
-        Testing::DataBinding::Hiera.hiera_config.should == { :logger => 'puppet' }
-      end
-    end
-  end
-
-  describe "the behavior of the find method", :if => Puppet.features.hiera? do
-
-    let(:data_binder) { Testing::DataBinding::Hiera.new }
-
-    it "should support looking up an integer" do
-      data_binder.find(request("integer")).should == 3000
-    end
-
-    it "should support looking up a string" do
-      data_binder.find(request("string")).should == 'apache'
-    end
-
-    it "should support looking up an array" do
-      data_binder.find(request("array")).should == [
-        '0.ntp.puppetlabs.com',
-        '1.ntp.puppetlabs.com',
-      ]
-    end
-
-    it "should support looking up a hash" do
-      data_binder.find(request("hash")).should == {
-        'user'  => 'Hightower',
-        'group' => 'admin',
-        'mode'  => '0644'
-      }
-    end
-
-    it "raises a data binding error if hiera cannot parse the yaml data" do
-      expect do
-        data_binder.find(request('invalid'))
-      end.to raise_error(Puppet::DataBinding::LookupError)
-    end
-  end
-
-  def request(key)
-    Puppet::Indirector::Request.new(:hiera, :find, key, nil)
-  end
+  it_should_behave_like "Hiera indirection", Testing::DataBinding::Hiera, my_fixture_dir
 end