diff --git a/metadata.json b/metadata.json
index b0cc4b8..d1eb699 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,81 +1,82 @@
 {
   "name": "puppetlabs-postgresql",
   "version": "5.4.0",
   "author": "Inkling/Puppet Labs",
   "summary": "Offers support for basic management of PostgreSQL databases.",
   "license": "Apache-2.0",
   "source": "git://github.com/puppetlabs/puppetlabs-postgresql.git",
   "project_page": "https://github.com/puppetlabs/puppetlabs-postgresql",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.13.1 < 5.0.0"
     },
     {
       "name": "puppetlabs/apt",
       "version_requirement": ">= 2.0.0 < 5.0.0"
     },
     {
       "name": "puppetlabs/concat",
       "version_requirement": ">= 1.1.0 < 5.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
         "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "7",
-        "8"
+        "8",
+        "9"
       ]
     },
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
         "16.04"
       ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
       "version_requirement": ">= 4.7.0 < 6.0.0"
     }
   ],
   "pdk-version": "1.5.0",
   "template-url": "https://github.com/puppetlabs/pdk-templates",
   "template-ref": "heads/master-0-g34e3266"
 }
diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index 607bf75..227836d 100644
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,101 +1,101 @@
 require 'puppet'
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'
 require 'beaker-task_helper'
 
 run_puppet_install_helper
 install_ca_certs unless pe_install?
 
 UNSUPPORTED_PLATFORMS = ['AIX', 'windows', 'Solaris', 'Suse'].freeze
 
 install_bolt_on(hosts) unless pe_install?
 install_module_on(hosts)
 install_module_dependencies_on(hosts)
 
 DEFAULT_PASSWORD = if default[:hypervisor] == 'vagrant'
                      'vagrant'
                    elsif default[:hypervisor] == 'vcloud'
                      'Qu@lity!'
                    end
 
 # Class String - unindent - Provide ability to remove indentation from strings, for the purpose of
 # left justifying heredoc blocks.
 class String
   def unindent
     gsub(%r{^#{scan(%r{^\s*}).min_by { |l| l.length }}}, '')
   end
 end
 
 def shellescape(str)
   str = str.to_s
 
   # An empty argument will be skipped, so return empty quotes.
   return "''" if str.empty?
 
   str = str.dup
 
   # Treat multibyte characters as is.  It is caller's responsibility
   # to encode the string in the right encoding for the shell
   # environment.
   str.gsub!(%r{([^A-Za-z0-9_\-.,:\/@\n])}, '\\\\\\1')
 
   # A LF cannot be escaped with a backslash because a backslash + LF
   # combo is regarded as line continuation and simply ignored.
   str.gsub!(%r{\n}, "'\n'")
 
   str
 end
 
 def psql(psql_cmd, user = 'postgres', exit_codes = [0, 1], &block)
   psql = "psql #{psql_cmd}"
   shell("su #{shellescape(user)} -c #{shellescape(psql)}", acceptable_exit_codes: exit_codes, &block)
 end
 
 RSpec.configure do |c|
   # Readable test descriptions
   c.formatter = :documentation
 
   # Configure all nodes in nodeset
   c.before :suite do
     run_puppet_access_login(user: 'admin') if pe_install? && puppet_version =~ %r{(5\.\d\.\d)}
     # Set up selinux if appropriate.
     if fact('osfamily') == 'RedHat' && fact('selinux') == 'true'
       pp = <<-EOS
         if $::osfamily == 'RedHat' and $::selinux == 'true' {
           $semanage_package = $::operatingsystemmajrelease ? {
             '5'     => 'policycoreutils',
             default => 'policycoreutils-python',
           }
 
           package { $semanage_package: ensure => installed }
           exec { 'set_postgres':
             command     => 'semanage port -a -t postgresql_port_t -p tcp 5433',
             path        => '/bin:/usr/bin/:/sbin:/usr/sbin',
             subscribe   => Package[$semanage_package],
           }
         }
       EOS
 
       apply_manifest_on(agents, pp, catch_failures: false)
     end
 
     # net-tools required for netstat utility being used by be_listening
-    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7'
+    if fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '7' || fact('osfamily') == 'Debian' && fact('operatingsystemmajrelease') == '9'
       pp = <<-EOS
         package { 'net-tools': ensure => installed }
       EOS
 
       apply_manifest_on(agents, pp, catch_failures: false)
     end
 
     hosts.each do |host|
       on host, 'chmod 755 /root'
       next unless fact_on(host, 'osfamily') == 'Debian'
       on host, "echo \"en_US ISO-8859-1\nen_NG.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\n\" > /etc/locale.gen"
       on host, '/usr/sbin/locale-gen'
       on host, '/usr/sbin/update-locale'
     end
   end
 end