diff --git a/.travis.yml b/.travis.yml
index 25e19ee..c365f95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,4 @@
 script: "./script/cibuild"
 gemfile: "this/does/not/exist"
 rvm:
-  - "1.8.7"
-  - "1.9.3"
+  - "2.0.0"
diff --git a/Gemfile b/Gemfile
index b35fba7..2d3cac5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "cardboard", "~> 1.0"
+gem "cardboard"
diff --git a/Gemfile.lock b/Gemfile.lock
index bb6c4fc..183655f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,75 +1,81 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
-    ansi (1.4.3)
-    boxen (1.5.2)
+    addressable (2.3.8)
+    ansi (1.5.0)
+    boxen (2.9.0)
       ansi (~> 1.4)
       hiera (~> 1.0)
-      highline (~> 1.6)
+      highline (~> 1.6.0)
       json_pure (>= 1.7.7, < 2.0)
-      librarian-puppet (~> 0.9.9)
-      octokit (~> 1.15)
-      puppet (~> 3.0)
-    cardboard (1.0.4)
-      boxen (~> 1.0)
+      librarian-puppet (~> 1.0.0)
+      octokit (~> 2.7, >= 2.7.1)
+      puppet (~> 3.7)
+    cardboard (2.1.0)
+      boxen (~> 2.1)
       puppet-lint (~> 0.3)
       puppetlabs_spec_helper (~> 0.4)
-      rspec-puppet (~> 0.1)
-    diff-lcs (1.2.5)
-    facter (1.7.3)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    hashie (2.0.5)
-    hiera (1.2.1)
+      rspec-puppet (~> 1.0)
+    diff-lcs (1.3)
+    facter (2.4.6)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    hiera (1.3.4)
       json_pure
-    highline (1.6.20)
-    json (1.8.1)
-    json_pure (1.8.1)
-    librarian-puppet (0.9.10)
-      json
+    highline (1.6.21)
+    json (2.1.0)
+    json_pure (1.8.6)
+    librarian (0.1.2)
+      highline
       thor (~> 0.15)
-    metaclass (0.0.1)
-    mocha (0.14.0)
+    librarian-puppet (1.0.9)
+      json
+      librarian (>= 0.1.2)
+    metaclass (0.0.4)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    multi_json (1.8.2)
-    multipart-post (1.2.0)
-    netrc (0.7.7)
-    octokit (1.25.0)
-      addressable (~> 2.2)
-      faraday (~> 0.8)
-      faraday_middleware (~> 0.9)
-      hashie (~> 2.0)
-      multi_json (~> 1.3)
-      netrc (~> 0.7.7)
-    puppet (3.3.2)
-      facter (~> 1.6)
+    multipart-post (2.0.0)
+    octokit (2.7.2)
+      sawyer (~> 0.5.2)
+    puppet (3.8.7)
+      facter (> 1.6, < 3)
       hiera (~> 1.0)
-      rgen (~> 0.6.5)
+      json_pure
     puppet-lint (0.3.2)
-    puppetlabs_spec_helper (0.4.1)
-      mocha (>= 0.10.5)
+    puppet-syntax (2.4.0)
       rake
-      rspec (>= 2.9.0)
-      rspec-puppet (>= 0.1.1)
-    rake (10.1.0)
-    rgen (0.6.6)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-puppet (0.1.6)
+    puppetlabs_spec_helper (0.10.3)
+      mocha
+      puppet-lint
+      puppet-syntax
+      rake
+      rspec-puppet
+    rake (12.0.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-puppet (1.0.1)
       rspec
-    thor (0.18.1)
+    rspec-support (3.6.0)
+    sawyer (0.5.5)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    thor (0.19.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cardboard (~> 1.0)
+  cardboard
+
+BUNDLED WITH
+   1.15.0
diff --git a/spec/classes/postgresql__config_spec.rb b/spec/classes/postgresql__config_spec.rb
index 5bd9d1f..917814f 100644
--- a/spec/classes/postgresql__config_spec.rb
+++ b/spec/classes/postgresql__config_spec.rb
@@ -4,7 +4,7 @@
   let(:facts) { default_test_facts }
 
   it do
-    should include_class('boxen::config')
+    should contain_class('boxen::config')
 
     %w(data/postgresql-9.5 log/postgresql-9.5).each do |d|
       should contain_file("/test/boxen/#{d}").with_ensure(:directory)
@@ -13,7 +13,7 @@
     contain_sysctl__set("kern.sysv.shmmax")
     contain_sysctl__set("kern.sysv.shmall")
 
-    should include_class("boxen::config")
+    should contain_class("boxen::config")
     should contain_boxen__env_script("postgresql")
     should contain_file("/Library/LaunchDaemons/dev.postgresql.plist")
   end
@@ -22,7 +22,7 @@
     let(:facts) { default_test_facts.merge(:operatingsystem => "Ubuntu") }
 
     it do
-      should_not include_class("boxen::config")
+      should_not contain_class("boxen::config")
 
       should_not contain_boxen__env_script("postgresql")
       should_not contain_file("/Library/LaunchDaemons/dev.postgresql.plist")
diff --git a/spec/defines/postgresql_db_spec.rb b/spec/defines/postgresql_db_spec.rb
index 0f5815b..a7f4880 100644
--- a/spec/defines/postgresql_db_spec.rb
+++ b/spec/defines/postgresql_db_spec.rb
@@ -5,7 +5,7 @@
   let(:title) { 'testdb' }
 
   it do
-    should include_class("postgresql")
+    should contain_class("postgresql")
 
     should contain_exec("postgresql-db-#{title}").with({
       :command => "/test/boxen/homebrew/bin/createdb -p15432 -E UTF-8 -O testuser #{title}",