diff --git a/Gemfile b/Gemfile
index 278451f9f..6d4ce9a07 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,8 +17,8 @@ group :development, :test do
 end
 
 group :system_tests do
-  gem 'beaker-rspec', :require => 'false'
-  gem 'beaker-puppet_install_helper', :require => false
+  gem 'beaker-rspec',                 :require => 'false'
+  gem 'beaker-puppet_install_helper', :require => 'false'
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index ce5d297ed..bc08f437c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -12,7 +12,7 @@ PuppetLint::RakeTask.new :lint do |config|
   config.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp"]
   config.fail_on_warnings = true
   config.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
-  config.disable_checks = ["80chars", "class_inherits_from_params_class", "class_parameter_defaults", "parameter_documentation"]
+  config.disable_checks = ["80chars", "class_inherits_from_params_class", "class_parameter_defaults", "only_variable_string"]
 end
 
 desc "Run acceptance tests"
diff --git a/spec/acceptance/nodesets/centos-70-x64.yml b/spec/acceptance/nodesets/centos-70-x64.yml
new file mode 100644
index 000000000..5f097e9fe
--- /dev/null
+++ b/spec/acceptance/nodesets/centos-70-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  centos-server-70-x64:
+    roles:
+      - master
+    platform: el-7-x86_64
+    box: puppetlabs/centos-7.0-64-nocm
+    box_url: https://vagrantcloud.com/puppetlabs/centos-7.0-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: debug
+  type: foss
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
index a2c1ecc63..486b6a34e 100644
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -1,9 +1,10 @@
 HOSTS:
-  ubuntu-14.04-amd64:
+  ubuntu-server-14.04-amd64:
     roles:
       - master
     platform: ubuntu-14.04-amd64
-    hypervisor : none
-    ip: 127.0.0.1
+    box: puppetlabs/ubuntu-14.04-64-nocm
+    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor: vagrant
 CONFIG:
   type: foss
diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml
index 575ae6732..c55287420 100644
--- a/spec/acceptance/nodesets/nodepool-centos7.yml
+++ b/spec/acceptance/nodesets/nodepool-centos7.yml
@@ -3,7 +3,7 @@ HOSTS:
     roles:
       - master
     platform: el-7-x86_64
-    hypervisor : none
+    hypervisor: none
     ip: 127.0.0.1
 CONFIG:
   type: foss
diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml
index a95d9f38d..9fc624e24 100644
--- a/spec/acceptance/nodesets/nodepool-trusty.yml
+++ b/spec/acceptance/nodesets/nodepool-trusty.yml
@@ -3,7 +3,7 @@ HOSTS:
     roles:
       - master
     platform: ubuntu-14.04-amd64
-    hypervisor : none
+    hypervisor: none
     ip: 127.0.0.1
 CONFIG:
   type: foss
diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
new file mode 100644
index 000000000..8001929b2
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
@@ -0,0 +1,11 @@
+HOSTS:
+  ubuntu-server-14.04-amd64:
+    roles:
+      - master
+    platform: ubuntu-14.04-amd64
+    box: puppetlabs/ubuntu-14.04-64-nocm
+    box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
+    hypervisor: vagrant
+CONFIG:
+  log_level: debug
+  type: foss