diff --git a/manifests/params.pp b/manifests/params.pp
index 8286353..339b421 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,195 +1,199 @@
 # @summary This class provides a number of parameters.
 # @api private
 class redis::params inherits redis::globals {
   case $facts['os']['family'] {
     'Debian': {
       $ppa_repo                  = 'ppa:chris-lea/redis-server'
 
       $config_dir                = '/etc/redis'
       $config_dir_mode           = '0755'
       $config_file               = '/etc/redis/redis.conf'
       $config_file_orig          = '/etc/redis/redis.conf.puppet'
       $config_owner              = 'redis'
       $log_dir_mode              = '0755'
       $package_name              = 'redis-server'
       $pid_file                  = '/var/run/redis/redis-server.pid'
       $workdir                   = '/var/lib/redis'
       $daemonize                 = true
       $service_name              = 'redis-server'
 
       $sentinel_config_file      = '/etc/redis/sentinel.conf'
       $sentinel_config_file_orig = '/etc/redis/redis-sentinel.conf.puppet'
       $sentinel_service_name     = 'redis-sentinel'
       $sentinel_daemonize        = true
       $sentinel_init_script      = '/etc/init.d/redis-sentinel'
       $sentinel_package_name     = 'redis-sentinel'
-      $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
       $sentinel_log_file         = '/var/log/redis/redis-sentinel.log'
       $sentinel_working_dir      = '/var/lib/redis'
 
       case $facts['os']['name'] {
         'Ubuntu': {
           $config_group = 'redis'
           $minimum_version = $facts['os']['release']['major'] ? {
             '16.04' => '3.0.5',
             default => '4.0.9',
           }
+          $sentinel_pid_file = $facts['os']['release']['major'] ? {
+            '16.04' => '/var/run/redis/redis-sentinel.pid',
+            default => '/var/run/sentinel/redis-sentinel.pid',
+          }
         }
         default: {
           $config_group              = 'root'
           $minimum_version           = '3.2.5'
+          $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
         }
       }
 
     }
 
     'RedHat': {
       $ppa_repo             = undef
       $daemonize            = false
       $config_owner         = 'redis'
       $config_group         = 'root'
       $config_dir_mode      = '0755'
       $log_dir_mode         = '0750'
 
       $sentinel_daemonize   = false
       $sentinel_init_script = undef
       $sentinel_working_dir = '/tmp'
 
       $scl = $redis::globals::scl
       if $scl {
         $config_dir                = "/etc/opt/rh/${scl}/redis"
         $config_file               = "/etc/opt/rh/${scl}/redis.conf"
         $config_file_orig          = "/etc/opt/rh/${scl}/redis.conf.puppet"
         $package_name              = "${scl}-redis"
         $pid_file                  = "/var/opt/rh/${scl}/run/redis_6379.pid"
         $service_name              = "${scl}-redis"
         $workdir                   = "/var/opt/rh/${scl}/lib/redis"
 
         $sentinel_config_file      = "${config_dir}/redis-sentinel.conf"
         $sentinel_config_file_orig = "${config_dir}/redis-sentinel.conf.puppet"
         $sentinel_service_name     = "${scl}-redis-sentinel"
         $sentinel_package_name     = $package_name
         $sentinel_pid_file         = "/var/opt/rh/${scl}/run/redis-sentinel.pid"
         $sentinel_log_file         = "/var/opt/rh/${scl}/log/redis/sentinel.log"
 
         $minimum_version = $scl ? {
           'rh-redis32' => '3.2.13',
           default      => '5.0.5',
         }
       } else {
         $config_dir                = '/etc/redis'
         $config_file               = '/etc/redis.conf'
         $config_file_orig          = '/etc/redis.conf.puppet'
         $package_name              = 'redis'
         $pid_file                  = $facts['os']['release']['major'] ? {
           '6'     => '/var/run/redis/redis.pid',
           default => '/var/run/redis_6379.pid',
         }
         $service_name              = 'redis'
         $workdir                   = '/var/lib/redis'
 
         $sentinel_config_file      = '/etc/redis-sentinel.conf'
         $sentinel_config_file_orig = '/etc/redis-sentinel.conf.puppet'
         $sentinel_service_name     = 'redis-sentinel'
         $sentinel_package_name     = 'redis'
         $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
         $sentinel_log_file         = '/var/log/redis/sentinel.log'
 
         # EPEL 6 and newer have 3.2 so we can assume all EL is 3.2+
         $minimum_version           = '3.2.10'
       }
     }
 
     'FreeBSD': {
       $ppa_repo                  = undef
 
       $config_dir                = '/usr/local/etc/redis'
       $config_dir_mode           = '0755'
       $config_file               = '/usr/local/etc/redis.conf'
       $config_file_orig          = '/usr/local/etc/redis.conf.puppet'
       $config_group              = 'wheel'
       $config_owner              = 'redis'
       $log_dir_mode              = '0755'
       $package_name              = 'redis'
       $pid_file                  = '/var/run/redis/redis.pid'
       $daemonize                 = true
       $service_name              = 'redis'
       $workdir                   = '/var/db/redis'
 
       $sentinel_config_file      = '/usr/local/etc/redis-sentinel.conf'
       $sentinel_config_file_orig = '/usr/local/etc/redis-sentinel.conf.puppet'
       $sentinel_service_name     = 'redis-sentinel'
       $sentinel_daemonize        = true
       $sentinel_init_script      = undef
       $sentinel_package_name     = 'redis'
       $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
       $sentinel_log_file         = '/var/log/redis/sentinel.log'
       $sentinel_working_dir      = '/tmp'
 
       # pkg version
       $minimum_version           = '3.2.4'
     }
 
     'Suse': {
       $ppa_repo                  = undef
 
       $config_dir                = '/etc/redis'
       $config_dir_mode           = '0750'
       $config_file               = '/etc/redis/redis-server.conf'
       $config_group              = 'redis'
       $config_owner              = 'redis'
       $log_dir_mode              = '0750'
       $package_name              = 'redis'
       $pid_file                  = '/var/run/redis/redis-server.pid'
       $daemonize                 = true
       $service_name              = 'redis'
       $workdir                   = '/var/lib/redis'
 
       $sentinel_config_file      = '/etc/redis/redis-sentinel.conf'
       $sentinel_config_file_orig = '/etc/redis/redis-sentinel.conf.puppet'
       $sentinel_service_name     = 'redis-sentinel'
       $sentinel_daemonize        = true
       $sentinel_init_script      = undef
       $sentinel_package_name     = 'redis'
       $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
       $sentinel_log_file         = '/var/log/redis/sentinel.log'
       $sentinel_working_dir      = '/tmp'
 
       # suse package version
       $minimum_version           = '3.0.5'
     }
 
     'Archlinux': {
       $ppa_repo                  = undef
 
       $config_dir                = '/etc/redis'
       $config_dir_mode           = '0755'
       $config_file               = '/etc/redis/redis.conf'
       $config_file_orig          = '/etc/redis/redis.conf.puppet'
       $config_group              = 'root'
       $config_owner              = 'root'
       $log_dir_mode              = '0755'
       $package_name              = 'redis'
       $pid_file                  = '/var/run/redis.pid'
       $daemonize                 = true
       $service_name              = 'redis'
       $workdir                   = '/var/lib/redis'
 
       $sentinel_config_file      = '/etc/redis/redis-sentinel.conf'
       $sentinel_config_file_orig = '/etc/redis/redis-sentinel.conf.puppet'
       $sentinel_service_name     = 'redis-sentinel'
       $sentinel_daemonize        = true
       $sentinel_init_script      = undef
       $sentinel_package_name     = 'redis'
       $sentinel_pid_file         = '/var/run/redis/redis-sentinel.pid'
       $sentinel_log_file         = '/var/log/redis/sentinel.log'
       $sentinel_working_dir      = '/tmp'
 
       # pkg version
       $minimum_version           = '3.2.4'
     }
     default: {
       fail "Operating system ${facts['os']['name']} is not supported yet."
     }
   }
 }
diff --git a/spec/classes/redis_sentinel_spec.rb b/spec/classes/redis_sentinel_spec.rb
index f483415..8d585f6 100644
--- a/spec/classes/redis_sentinel_spec.rb
+++ b/spec/classes/redis_sentinel_spec.rb
@@ -1,105 +1,113 @@
 require 'spec_helper'
 
 describe 'redis::sentinel' do
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) { facts }
       let(:config_file_orig) do
         case facts[:osfamily]
         when 'Archlinux'
           '/etc/redis/redis-sentinel.conf.puppet'
         when 'Debian'
           '/etc/redis/redis-sentinel.conf.puppet'
         when 'Suse'
           '/etc/redis/redis-sentinel.conf.puppet'
         when 'FreeBSD'
           '/usr/local/etc/redis-sentinel.conf.puppet'
         when 'RedHat'
           '/etc/redis-sentinel.conf.puppet'
         end
       end
 
+      let(:pidfile) do
+        if facts[:operatingsystem] == 'Ubuntu'
+          facts[:operatingsystemmajrelease] == '16.04' ? '/var/run/redis/redis-sentinel.pid' : '/var/run/sentinel/redis-sentinel.pid'
+        else
+          '/var/run/redis/redis-sentinel.pid'
+        end
+      end
+
       describe 'without parameters' do
         let(:expected_content) do
           <<CONFIG
 port 26379
 dir #{facts[:osfamily] == 'Debian' ? '/var/lib/redis' : '/tmp'}
 daemonize #{facts[:osfamily] == 'RedHat' ? 'no' : 'yes'}
-pidfile /var/run/redis/redis-sentinel.pid
+pidfile #{pidfile}
 
 sentinel monitor mymaster 127.0.0.1 6379 2
 sentinel down-after-milliseconds mymaster 30000
 sentinel parallel-syncs mymaster 1
 sentinel failover-timeout mymaster 180000
 
 loglevel notice
 logfile #{facts[:osfamily] == 'Debian' ? '/var/log/redis/redis-sentinel.log' : '/var/log/redis/sentinel.log'}
 CONFIG
         end
 
         it { is_expected.to create_class('redis::sentinel') }
 
         it {
           is_expected.to contain_file(config_file_orig).
             with_ensure('file').
             with_mode('0644').
             with_owner('redis').
             with_content(expected_content)
         }
 
         it {
           is_expected.to contain_service('redis-sentinel').
             with_ensure('running').
             with_enable('true')
         }
 
         if facts[:os]['family'] == 'Debian'
           it { is_expected.to contain_package('redis-sentinel').with_ensure('present') }
         else
           it { is_expected.not_to contain_package('redis-sentinel') }
         end
       end
 
       describe 'with custom parameters' do
         let(:params) do
           {
             auth_pass: 'password',
             sentinel_bind: '192.0.2.10',
             master_name: 'cow',
             down_after: 6000,
             working_dir: '/tmp/redis',
             log_file: '/tmp/barn-sentinel.log',
             failover_timeout: 28_000,
             notification_script: '/path/to/bar.sh',
             client_reconfig_script: '/path/to/foo.sh'
           }
         end
 
         let(:expected_content) do
           <<CONFIG
 bind 192.0.2.10
 port 26379
 dir /tmp/redis
 daemonize #{facts[:osfamily] == 'RedHat' ? 'no' : 'yes'}
-pidfile /var/run/redis/redis-sentinel.pid
+pidfile #{pidfile}
 
 sentinel monitor cow 127.0.0.1 6379 2
 sentinel down-after-milliseconds cow 6000
 sentinel parallel-syncs cow 1
 sentinel failover-timeout cow 28000
 sentinel auth-pass cow password
 sentinel notification-script cow /path/to/bar.sh
 sentinel client-reconfig-script cow /path/to/foo.sh
 
 loglevel notice
 logfile /tmp/barn-sentinel.log
 CONFIG
         end
 
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to create_class('redis::sentinel') }
         it { is_expected.to contain_file(config_file_orig).with_content(expected_content) }
       end
     end
   end
 end