diff --git a/Gemfile b/Gemfile
index 20f3df025..5bbc6f9ff 100644
--- a/Gemfile
+++ b/Gemfile
@@ -54,7 +54,7 @@ group :system_tests do
   gem 'serverspec',                         :require => false
   gem 'beaker-hostgenerator', '>= 1.1.10',  :require => false
   gem 'beaker-docker',                      :require => false
-  gem 'beaker-puppet',                      :require => false
+  gem 'beaker-puppet',                      :require => false, :git => 'https://github.com/alexjfisher/beaker-puppet.git', :branch => 'fact_on'
   gem 'beaker-puppet_install_helper',       :require => false
   gem 'beaker-module_install_helper',       :require => false
   gem 'rbnacl', '>= 4',                     :require => false if RUBY_VERSION >= '2.2.6'
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index abc0cee2f..e4482ddba 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -37,14 +37,14 @@ class { '::collectd::plugin::rabbitmq': }
       apply_manifest(pp, catch_changes: true)
     end
 
-    if fact(:osfamily) == 'Debian'
+    if fact('osfamily') == 'Debian'
       describe file('/etc/collectd/conf.d/10-rabbitmq.conf') do
         it { is_expected.to be_file }
         it { is_expected.to contain 'TypesDB "/usr/local/share/collectd-rabbitmq/types.db.custom"' }
       end
     end
 
-    if fact(:osfamily) == 'RedHat'
+    if fact('osfamily') == 'RedHat'
       describe file('/etc/collectd.d/10-rabbitmq.conf') do
         it { is_expected.to be_file }
         it { is_expected.to contain 'TypesDB "/usr/share/collectd-rabbitmq/types.db.custom"' }
diff --git a/spec/acceptance/curl_json_spec.rb b/spec/acceptance/curl_json_spec.rb
index e06de9774..247f1f3af 100644
--- a/spec/acceptance/curl_json_spec.rb
+++ b/spec/acceptance/curl_json_spec.rb
@@ -24,9 +24,9 @@
       apply_manifest(pp, catch_changes: true)
     end
 
-    case fact(:osfamily)
+    case fact('osfamily')
     when 'Debian'
-      curl_json_package = if fact(:lsbdistcodename) == 'precise'
+      curl_json_package = if fact('lsbdistcodename') == 'precise'
                             'libyajl1'
                           else
                             'libyajl2'