diff --git a/spec/unit/classes/init_spec.rb b/spec/unit/classes/init_spec.rb
index 50e07d1..0cd575a 100644
--- a/spec/unit/classes/init_spec.rb
+++ b/spec/unit/classes/init_spec.rb
@@ -1,66 +1,80 @@
 require 'spec_helper'
 
 describe 'puppetdb', type: :class do
   ttl_args = ['node_ttl', 'node_purge_ttl', 'report_ttl']
 
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
         facts.merge(selinux: false)
       end
 
       describe 'when using default values for puppetdb class' do
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_class('puppetdb') }
         it { is_expected.to contain_class('puppetdb::server') }
         it { is_expected.to contain_class('puppetdb::database::postgresql') }
+        it { is_expected.to contain_postgresql__server__db('puppetdb') }
       end
 
       describe 'without managed postgresql' do
         let :pre_condition do
           <<-HEREDOC
           class { 'postgresql::server':
           }
           HEREDOC
         end
 
         let :params do
           {
             manage_dbserver: false,
           }
         end
 
         describe 'manifest' do
           it { is_expected.to compile.with_all_deps }
         end
       end
+      describe 'without managed postgresql database' do
+        let :params do
+          {
+            manage_dbserver: true,
+            manage_database: false,
+          }
+        end
+
+        describe 'manifest' do
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.not_to contain_postgresql__server__db('puppetdb') }
+        end
+      end
     end
   end
 
   context 'with invalid arguments on a supported platform' do
     let(:facts) do
       {
         osfamily: 'RedHat',
         operatingsystem: 'Debian',
         puppetversion: Puppet.version,
         operatingsystemrelease: '6.0',
         kernel: 'Linux',
         concat_basedir: '/var/lib/puppet/concat',
         selinux: true,
         iptables_persistent_version: '0.5.7',
       }
     end
 
     ttl_args.each do |ttl_arg|
       let(:params) do
         {
           ttl_arg => 'invalid_value',
         }
       end
 
       it "when using a value that does not match the validation regex for #{ttl_arg} puppetdb class" do
         expect { is_expected.to contain_class('puppetdb') }.to raise_error(Puppet::Error)
       end
     end
   end
 end