diff --git a/Gemfile b/Gemfile
index 8e3c947..8434a22 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,22 +1,20 @@
 source 'https://rubygems.org'
 
 puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 2.7.0','< 5.0']
 gem 'puppet', puppetversion
 gem 'puppet-lint'
 gem 'puppetlabs_spec_helper'
 gem 'rake'
 gem 'librarian-puppet', '>= 2.0'
 gem 'highline'
-gem 'rspec-system-puppet',     :require => false
-gem 'serverspec',              :require => false
-gem 'rspec-system-serverspec', :require => false
+gem 'rspec-puppet-facts'
 # coverage reports will be in release 2.0
-gem 'rspec-puppet', '>= 2.2'
-gem 'rspec', '~> 2.13'
+gem 'rspec', '>= 3.0.0'
+gem 'rspec-puppet', '>= 2.3.0'
 gem 'metadata-json-lint', :require => false
 
 group :development do
   gem 'puppet-blacksmith'
   gem 'beaker'
   gem 'beaker-rspec', :require => false
 end
diff --git a/Rakefile b/Rakefile
index 1b11333..1ac45ee 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,25 +1,29 @@
-require 'bundler'
-Bundler.require(:rake)
+require 'rubygems'
+require 'bundler/setup'
 
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet/version'
+require 'puppet/vendor/semantic/lib/semantic' unless Puppet.version.to_f < 3.6
 require 'puppet-lint/tasks/puppet-lint'
-require 'rspec-system/rake_task'
+require 'puppet-syntax/tasks/puppet-syntax'
+require 'metadata-json-lint/rake_task'
+
 # blacksmith does not support ruby 1.8.7 anymore
 require 'puppet_blacksmith/rake_tasks' if ENV['RAKE_ENV'] != 'ci' && RUBY_VERSION.split('.')[0,3].join.to_i > 187
 
 desc 'Lint metadata.json file'
 task :meta do
   sh 'metadata-json-lint metadata.json'
 end
 
 Rake::Task[:lint].clear
 PuppetLint::RakeTask.new :lint do |config|
   config.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp", "pkg/**/*.pp"]
   config.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
 end
 
 task :librarian_spec_prep do
   sh 'librarian-puppet install --path=spec/fixtures/modules/'
 end
 task :spec_prep => :librarian_spec_prep
 task :default => [:spec, :lint]