diff --git a/Gemfile b/Gemfile
index f44f7974..ac2cdb38 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,9 +2,10 @@ source "https://rubygems.org"
 
 group :development, :test do
   gem 'rake'
-  gem 'rspec', "~> 3.4.0", :require => false
-  gem 'mocha', "~> 0.10.5", :require => false
+  gem 'rspec', "~> 3.4.0",      :require => false
+  gem 'mocha', "~> 0.10.5",     :require => false
   gem 'puppetlabs_spec_helper', :require => false
+  gem 'puppet-blacksmith',      :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
@@ -15,12 +16,12 @@ end
 
 gem 'puppet-lint', '>= 1.0.0'
 gem 'puppet-lint-unquoted_string-check', :require => false
-gem 'public_suffix', '1.4.6', :require => false if RUBY_VERSION <= '1.9.3'
-gem 'public_suffix',          :require => false if RUBY_VERSION > '1.9.3'
-gem 'json',      '<= 1.8'   , :require => false if RUBY_VERSION < '2.0.0'
-gem 'json_pure', '<= 2.0.1' , :require => false if RUBY_VERSION < '2.0.0'
-gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9'
-gem 'metadata-json-lint',           :require => false if RUBY_VERSION >= '1.9'
+gem 'public_suffix', '1.4.6',            :require => false if RUBY_VERSION <= '1.9.3'
+gem 'public_suffix',                     :require => false if RUBY_VERSION > '1.9.3'
+gem 'json',      '<= 1.8'   ,            :require => false if RUBY_VERSION < '2.0.0'
+gem 'json_pure', '<= 2.0.1' ,            :require => false if RUBY_VERSION < '2.0.0'
+gem 'metadata-json-lint', '0.0.11',      :require => false if RUBY_VERSION < '1.9'
+gem 'metadata-json-lint',                :require => false if RUBY_VERSION >= '1.9'
 
 if RUBY_VERSION < '2.0'
       gem 'mime-types', '<3.0', :require => false
@@ -30,7 +31,7 @@ group :system_tests do
   if beaker_version = ENV['BEAKER_VERSION']
     gem 'beaker', *location_for(beaker_version)
   end
-  gem 'beaker-puppet_install_helper', :require => false
+  gem 'beaker-puppet_install_helper',  :require => false
   gem 'master_manipulator', '~> 1.2',  :require => false
 end
 # vim:ft=ruby
diff --git a/Rakefile b/Rakefile
index a0e8569d..773ba382 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,4 +1,5 @@
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet_blacksmith/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.relative = true