diff --git a/Gemfile b/Gemfile
index 0be538c..e729067 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 group :development, :test do
   gem 'rake'
   gem 'puppetlabs_spec_helper', :require => false
+  gem 'rspec-puppet', '< 1.0'
   gem 'rspec-system-puppet', '~>2.0'
   gem 'rspec-system-serverspec', '~>1.0'
   gem 'puppet-lint', '~> 0.3.2'
diff --git a/spec/unit/classes/globals_spec.rb b/spec/unit/classes/globals_spec.rb
index 746046f..b64d3b8 100644
--- a/spec/unit/classes/globals_spec.rb
+++ b/spec/unit/classes/globals_spec.rb
@@ -11,7 +11,7 @@ describe 'postgresql::globals', :type => :class do
 
   describe 'with no parameters' do
     it 'should work' do
-      should include_class("postgresql::globals")
+      should contain_class("postgresql::globals")
     end
   end
 
@@ -22,7 +22,7 @@ describe 'postgresql::globals', :type => :class do
       }
     end
     it 'should pull in class postgresql::repo' do
-      should include_class("postgresql::repo")
+      should contain_class("postgresql::repo")
     end
   end
 end
diff --git a/spec/unit/classes/lib/devel_spec.rb b/spec/unit/classes/lib/devel_spec.rb
index f0d03fa..8c289fc 100644
--- a/spec/unit/classes/lib/devel_spec.rb
+++ b/spec/unit/classes/lib/devel_spec.rb
@@ -8,5 +8,5 @@ describe 'postgresql::lib::devel', :type => :class do
       :operatingsystemrelease => '6.0',
     }
   end
-  it { should include_class("postgresql::lib::devel") }
+  it { should contain_class("postgresql::lib::devel") }
 end
diff --git a/spec/unit/classes/params_spec.rb b/spec/unit/classes/params_spec.rb
index 3d9441f..730fd10 100644
--- a/spec/unit/classes/params_spec.rb
+++ b/spec/unit/classes/params_spec.rb
@@ -8,5 +8,5 @@ describe 'postgresql::params', :type => :class do
       :operatingsystemrelease => '6.0',
     }
   end
-  it { should include_class("postgresql::params") }
+  it { should contain_class("postgresql::params") }
 end
diff --git a/spec/unit/classes/repo_spec.rb b/spec/unit/classes/repo_spec.rb
index 0980036..86ce133 100644
--- a/spec/unit/classes/repo_spec.rb
+++ b/spec/unit/classes/repo_spec.rb
@@ -11,7 +11,7 @@ describe 'postgresql::repo', :type => :class do
 
   describe 'with no parameters' do
     it 'should instantiate apt_postgresql_org class' do
-      should include_class('postgresql::repo::apt_postgresql_org')
+      should contain_class('postgresql::repo::apt_postgresql_org')
     end
   end
 end
diff --git a/spec/unit/classes/server/plperl_spec.rb b/spec/unit/classes/server/plperl_spec.rb
index 964a47f..785ed9a 100644
--- a/spec/unit/classes/server/plperl_spec.rb
+++ b/spec/unit/classes/server/plperl_spec.rb
@@ -16,7 +16,7 @@ describe 'postgresql::server::plperl', :type => :class do
   end
 
   describe 'with no parameters' do
-    it { should include_class("postgresql::server::plperl") }
+    it { should contain_class("postgresql::server::plperl") }
     it 'should create package' do
       should contain_package('postgresql-plperl').with({
         :ensure => 'present',
@@ -33,7 +33,7 @@ describe 'postgresql::server::plperl', :type => :class do
       }
     end
 
-    it { should include_class("postgresql::server::plperl") }
+    it { should contain_class("postgresql::server::plperl") }
     it 'should create package with correct params' do
       should contain_package('postgresql-plperl').with({
         :ensure => 'absent',
diff --git a/spec/unit/classes/server_spec.rb b/spec/unit/classes/server_spec.rb
index 74a6227..49ddedc 100644
--- a/spec/unit/classes/server_spec.rb
+++ b/spec/unit/classes/server_spec.rb
@@ -12,8 +12,8 @@ describe 'postgresql::server', :type => :class do
   end
 
   describe 'with no parameters' do
-    it { should include_class("postgresql::params") }
-    it { should include_class("postgresql::server") }
+    it { should contain_class("postgresql::params") }
+    it { should contain_class("postgresql::server") }
     it 'should validate connection' do
       should contain_postgresql__validate_db_connection('validate_service_is_running')
     end