diff --git a/Gemfile b/Gemfile
index 79c7bdd8e..be5e34df3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,92 +1,93 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 def location_for(place, fake_version = nil)
   if place =~ /^(git[:@][^#]*)#(.*)/
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
   elsif place =~ /^file:\/\/(.*)/
     ['>= 0', { :path => File.expand_path($1), :require => false }]
   else
     [place, { :require => false }]
   end
 end
 
 # C Ruby (MRI) or Rubinius, but NOT Windows
 platforms :ruby do
   gem 'pry', :group => :development
   gem 'yard', :group => :development
   gem 'redcarpet', '~> 2.0', :group => :development
   gem "racc", "1.4.9", :group => :development
 
   # To enable the augeas feature, use this gem.
   # Note that it is a native gem, so the augeas headers/libs
   # are neeed.
   #gem 'ruby-augeas', :group => :development
 end
 
 gem "puppet", :path => File.dirname(__FILE__), :require => false
 gem "facter", *location_for(ENV['FACTER_LOCATION'] || ['> 1.6', '< 3'])
 gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
 gem "rake", "10.1.1", :require => false
 
 group(:development, :test) do
   gem "rspec", "~> 3.1", :require => false
   gem "rspec-its", "~> 1.1", :require => false
+  gem "rspec-collection_matchers", "~> 1.1", :require => false
 
   # Mocha is not compatible across minor version changes; because of this only
   # versions matching ~> 0.10.5 are supported. All other versions are unsupported
   # and can be expected to fail.
   gem "mocha", "~> 0.10.5", :require => false
 
   gem "yarjuf", "~> 1.0"
 
   # json-schema does not support windows, so omit it from the platforms list
   # json-schema uses multi_json, but chokes with multi_json 1.7.9, so prefer 1.7.7
   gem "multi_json", "1.7.7", :require => false, :platforms => [:ruby, :jruby]
   gem "json-schema", "2.1.1", :require => false, :platforms => [:ruby, :jruby]
 
   gem "rubocop", "~> 0.26.1", :platforms => [:ruby]
 
   gem 'rdoc', "~> 4.1", :platforms => [:ruby]
 end
 
 group(:development) do
   if RUBY_PLATFORM != 'java'
     gem 'ruby-prof', :require => false
   end
 end
 
 group(:extra) do
   gem "rack", "~> 1.4", :require => false
   gem "net-ssh", '~> 2.1', :require => false
   gem "puppetlabs_spec_helper", :require => false
   gem "tzinfo", :require => false
   case RUBY_PLATFORM
   when 'java'
     gem "msgpack-jruby", :require => false
   else
     gem "msgpack", :require => false
   end
 end
 
 require 'yaml'
 data = YAML.load_file(File.join(File.dirname(__FILE__), 'ext', 'project_data.yaml'))
 bundle_platforms = data['bundle_platforms']
 x64_platform = Gem::Platform.local.cpu == 'x64'
 data['gem_platform_dependencies'].each_pair do |gem_platform, info|
   next if gem_platform == 'x86-mingw32' && x64_platform
   next if gem_platform == 'x64-mingw32' && !x64_platform
   if bundle_deps = info['gem_runtime_dependencies']
     bundle_platform = bundle_platforms[gem_platform] or raise "Missing bundle_platform"
     platform(bundle_platform.intern) do
       bundle_deps.each_pair do |name, version|
         gem(name, version, :require => false)
       end
     end
   end
 end
 
 if File.exists? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end
 
 # vim:filetype=ruby
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 552c36a0d..5fb0b96dd 100755
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,193 +1,194 @@
 # NOTE: a lot of the stuff in this file is duplicated in the "puppet_spec_helper" in the project
 #  puppetlabs_spec_helper.  We should probably eat our own dog food and get rid of most of this from here,
 #  and have the puppet core itself use puppetlabs_spec_helper
 
 dir = File.expand_path(File.dirname(__FILE__))
 $LOAD_PATH.unshift File.join(dir, 'lib')
 
 # Don't want puppet getting the command line arguments for rake or autotest
 ARGV.clear
 
 begin
   require 'rubygems'
 rescue LoadError
 end
 
 require 'puppet'
 gem 'rspec', '>=3.1.0'
 require 'rspec/expectations'
 require 'rspec/its'
+require 'rspec/collection_matchers'
 
 # So everyone else doesn't have to include this base constant.
 module PuppetSpec
   FIXTURE_DIR = File.join(dir = File.expand_path(File.dirname(__FILE__)), "fixtures") unless defined?(FIXTURE_DIR)
 end
 
 require 'pathname'
 require 'tmpdir'
 require 'fileutils'
 
 require 'puppet_spec/verbose'
 require 'puppet_spec/files'
 require 'puppet_spec/settings'
 require 'puppet_spec/fixtures'
 require 'puppet_spec/matchers'
 require 'monkey_patches/alias_should_to_must'
 require 'puppet/test/test_helper'
 
 Pathname.glob("#{dir}/shared_contexts/*.rb") do |file|
   require file.relative_path_from(Pathname.new(dir))
 end
 
 Pathname.glob("#{dir}/shared_behaviours/**/*.rb") do |behaviour|
   require behaviour.relative_path_from(Pathname.new(dir))
 end
 
 RSpec.configure do |config|
   include PuppetSpec::Fixtures
 
   # Examples or groups can selectively tag themselves as broken.
   # For example;
   #
   # rbv = "#{RUBY_VERSION}-p#{RbConfig::CONFIG['PATCHLEVEL']}"
   # describe "mostly working", :broken => false unless rbv == "1.9.3-p327" do
   #  it "parses a valid IP" do
   #    IPAddr.new("::2:3:4:5:6:7:8")
   #  end
   # end
   exclude_filters = {:broken => true}
   exclude_filters[:benchmark] = true unless ENV['BENCHMARK']
   config.filter_run_excluding exclude_filters
 
   config.mock_with :mocha
 
   tmpdir = Dir.mktmpdir("rspecrun")
   oldtmpdir = Dir.tmpdir()
   ENV['TMPDIR'] = tmpdir
 
   if Puppet::Util::Platform.windows?
     config.output_stream = $stdout
     config.error_stream = $stderr
 
     config.formatters.each do |f|
       if not f.instance_variable_get(:@output).kind_of?(::File)
         f.instance_variable_set(:@output, $stdout)
       end
     end
   end
 
   Puppet::Test::TestHelper.initialize
 
   config.before :all do
     Puppet::Test::TestHelper.before_all_tests()
     if ENV['PROFILE'] == 'all'
       require 'ruby-prof'
       RubyProf.start
     end
   end
 
   config.after :all do
     if ENV['PROFILE'] == 'all'
       require 'ruby-prof'
       result = RubyProf.stop
       printer = RubyProf::CallTreePrinter.new(result)
       open(File.join(ENV['PROFILEOUT'],"callgrind.all.#{Time.now.to_i}.trace"), "w") do |f|
         printer.print(f)
       end
     end
 
     Puppet::Test::TestHelper.after_all_tests()
   end
 
   config.before :each do
     # Disabling garbage collection inside each test, and only running it at
     # the end of each block, gives us an ~ 15 percent speedup, and more on
     # some platforms *cough* windows *cough* that are a little slower.
     GC.disable
 
     # REVISIT: I think this conceals other bad tests, but I don't have time to
     # fully diagnose those right now.  When you read this, please come tell me
     # I suck for letting this float. --daniel 2011-04-21
     Signal.stubs(:trap)
 
 
     # TODO: in a more sane world, we'd move this logging redirection into our TestHelper class.
     #  Without doing so, external projects will all have to roll their own solution for
     #  redirecting logging, and for validating expected log messages.  However, because the
     #  current implementation of this involves creating an instance variable "@logs" on
     #  EVERY SINGLE TEST CLASS, and because there are over 1300 tests that are written to expect
     #  this instance variable to be available--we can't easily solve this problem right now.
     #
     # redirecting logging away from console, because otherwise the test output will be
     #  obscured by all of the log output
     @logs = []
     Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(@logs))
 
     @log_level = Puppet::Util::Log.level
 
     base = PuppetSpec::Files.tmpdir('tmp_settings')
     Puppet[:vardir] = File.join(base, 'var')
     Puppet[:confdir] = File.join(base, 'etc')
     Puppet[:logdir] = "$vardir/log"
     Puppet[:rundir] = "$vardir/run"
     Puppet[:hiera_config] = File.join(base, 'hiera')
 
     Puppet::Test::TestHelper.before_each_test()
   end
 
   config.after :each do
     Puppet::Test::TestHelper.after_each_test()
 
     # TODO: would like to move this into puppetlabs_spec_helper, but there are namespace issues at the moment.
     PuppetSpec::Files.cleanup
 
     # TODO: this should be abstracted in the future--see comments above the '@logs' block in the
     #  "before" code above.
     #
     # clean up after the logging changes that we made before each test.
     @logs.clear
     Puppet::Util::Log.close_all
     Puppet::Util::Log.level = @log_level
 
     # This will perform a GC between tests, but only if actually required.  We
     # experimented with forcing a GC run, and that was less efficient than
     # just letting it run all the time.
     GC.enable
   end
 
   config.after :suite do
     # Log the spec order to a file, but only if the LOG_SPEC_ORDER environment variable is
     #  set.  This should be enabled on Jenkins runs, as it can be used with Nick L.'s bisect
     #  script to help identify and debug order-dependent spec failures.
     if ENV['LOG_SPEC_ORDER']
       File.open("./spec_order.txt", "w") do |logfile|
         config.instance_variable_get(:@files_to_run).each { |f| logfile.puts f }
       end
     end
 
     # return to original tmpdir
     ENV['TMPDIR'] = oldtmpdir
     FileUtils.rm_rf(tmpdir)
   end
 
   if ENV['PROFILE']
     require 'ruby-prof'
 
     def profile
       result = RubyProf.profile { yield }
       name = example.metadata[:full_description].downcase.gsub(/[^a-z0-9_-]/, "-").gsub(/-+/, "-")
       printer = RubyProf::CallTreePrinter.new(result)
       open(File.join(ENV['PROFILEOUT'],"callgrind.#{name}.#{Time.now.to_i}.trace"), "w") do |f|
         printer.print(f)
       end
     end
 
     config.around(:each) do |example|
       if ENV['PROFILE'] == 'each' or (example.metadata[:profile] and ENV['PROFILE'])
         profile { example.run }
       else
         example.run
       end
     end
   end
 end