diff --git a/manifests/application.pp b/manifests/application.pp
index 8ef7e1a..ad8aa30 100644
--- a/manifests/application.pp
+++ b/manifests/application.pp
@@ -20,6 +20,11 @@
 #
 class storyboard::application (
 
+  # Required parameters
+  $openid_url,
+  $mysql_user_password,
+  $rabbitmq_user_password,
+
   # Installation parameters
   $src_root_api           = '/opt/storyboard',
   $src_root_webclient     = '/opt/storyboard-webclient',
@@ -35,7 +40,6 @@ class storyboard::application (
   $authorization_code_ttl = 300,
   $access_token_ttl       = 3600,
   $refresh_token_ttl      = 604800,
-  $openid_url,
   $valid_oauth_clients    = [$::fqdn],
   $enable_token_cleanup   = 'True',
 
@@ -43,13 +47,11 @@ class storyboard::application (
   $mysql_port             = 3306,
   $mysql_database         = 'storyboard',
   $mysql_user             = 'storyboard',
-  $mysql_user_password,
 
   $rabbitmq_host          = 'localhost',
   $rabbitmq_port          = 5672,
   $rabbitmq_vhost         = '/',
   $rabbitmq_user          = 'storyboard',
-  $rabbitmq_user_password,
   $enable_notifications   = 'True',
 
   $enable_cron            = 'True',
diff --git a/manifests/init.pp b/manifests/init.pp
index a095f26..b1d3054 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,12 +20,12 @@
 # please use individual submodules.
 #
 class storyboard (
+  $mysql_user_password,
+  $rabbitmq_user_password,
   $mysql_database      = 'storyboard',
   $mysql_user          = 'storyboard',
-  $mysql_user_password,
 
   $rabbitmq_user       = 'storyboard',
-  $rabbitmq_user_password,
 
   $valid_oauth_clients = [$::fqdn],
 
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 187fd50..60ff115 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -18,9 +18,9 @@
 # of mysql for storyboard to connect to.
 #
 class storyboard::mysql (
+  $mysql_user_password,
   $mysql_database      = 'storyboard',
   $mysql_user          = 'storyboard',
-  $mysql_user_password,
 ) {
 
   # Install MySQL
diff --git a/manifests/rabbit.pp b/manifests/rabbit.pp
index f521dc0..a18b367 100644
--- a/manifests/rabbit.pp
+++ b/manifests/rabbit.pp
@@ -19,8 +19,8 @@
 # StoryBoard.
 #
 class storyboard::rabbit (
+  $rabbitmq_user_password,
   $rabbitmq_user          = 'storyboard',
-  $rabbitmq_user_password
 ) {
 
   require ::storyboard::params
diff --git a/spec/acceptance/nodesets/nodepool-xenial.yml b/spec/acceptance/nodesets/nodepool-xenial.yml
new file mode 100644
index 0000000..99dd318
--- /dev/null
+++ b/spec/acceptance/nodesets/nodepool-xenial.yml
@@ -0,0 +1,10 @@
+HOSTS:
+  ubuntu-16.04-amd64:
+    roles:
+      - master
+    platform: ubuntu-16.04-amd64
+    hypervisor: none
+    ip: 127.0.0.1
+CONFIG:
+  type: foss
+  set_env: false
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 7a5efa1..002ab34 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -2,7 +2,14 @@ require 'beaker-rspec'
 
 hosts.each do |host|
 
-  install_puppet
+  # puppet 3 isn't available from apt.puppetlabs.com so install it from the Xenial repos
+  on host, "which apt-get && apt-get install puppet -y", { :acceptable_exit_codes => [0,1] }
+  # otherwise use the beaker helpers to install the yum.puppetlabs.com repo and puppet
+  r = on host, "which yum",  { :acceptable_exit_codes => [0,1] }
+  if r.exit_code == 0
+    install_puppet
+  end
+  add_platform_foss_defaults(host, 'unix')
 
   on host, "mkdir -p #{host['distmoduledir']}"
 end