diff --git a/manifests/sentinel.pp b/manifests/sentinel.pp
index 1f770bf..14237d1 100644
--- a/manifests/sentinel.pp
+++ b/manifests/sentinel.pp
@@ -1,257 +1,261 @@
 # = Class: redis::sentinel
 #
 # This class installs redis-sentinel
 #
 # == Parameters:
 #
 #
 # [*auth_pass*]
 #   The password to use to authenticate with the master and slaves.
 #
 #   Default: undef
 #
 # [*config_file*]
 #   The location and name of the sentinel config file.
 #
 #   Default for deb: /etc/redis/redis-sentinel.conf
 #   Default for rpm: /etc/redis-sentinel.conf
 #
 # [*config_file_orig*]
 #   The location and name of a config file that provides the source
 #   of the sentinel config file. Two different files are needed
 #   because sentinel itself writes to its own config file and we do
 #   not want override that when puppet is run unless there are
 #   changes from the manifests.
 #
 #   Default for deb: /etc/redis/redis-sentinel.conf.puppet
 #   Default for rpm: /etc/redis-sentinel.conf.puppet
 #
 # [*config_file_mode*]
 #   Permissions of config file.
 #
 #   Default: 0644
 #
 # [*conf_template*]
 #   Define which template to use.
 #
 #   Default: redis/redis-sentinel.conf.erb
 #
 # [*daemonize*]
 #   Have Redis sentinel run as a daemon.
 #
 #   Default: true
 #
 # [*down_after*]
 #   Number of milliseconds the master (or any attached slave or sentinel)
 #   should be unreachable (as in, not acceptable reply to PING, continuously,
 #   for the specified period) in order to consider it in S_DOWN state.
 #
 #   Default: 30000
 #
 # [*failover_timeout*]
 #   Specify the failover timeout in milliseconds.
 #
 #   Default: 180000
 #
 # [*init_script*]
 #   Specifiy the init script that will be created for sentinel.
 #
 #   Default: undef on rpm, /etc/init.d/redis-sentinel on apt.
 #
 # [*log_file*]
 #   Specify where to write log entries.
 #
 #   Default: /var/log/redis/redis.log
 #
 # [*log_level*]
 #   Specify how much we should log.
 #
 #   Default: notice
 #
 # [*master_name*]
 #   Specify the name of the master redis server.
 #   The valid charset is A-z 0-9 and the three characters ".-_".
 #
 #   Default: mymaster
 #
 # [*redis_host*]
 #   Specify the bound host of the master redis server.
 #
 #   Default: 127.0.0.1
 #
 # [*redis_port*]
 #   Specify the port of the master redis server.
 #
 #   Default: 6379
 #
 # [*package_name*]
 #   The name of the package that installs sentinel.
 #
 #   Default: 'redis-server' on apt, 'redis' on rpm
 #
 # [*package_ensure*]
 #   Do we ensure this package.
 #
 #   Default: 'present'
 #
 # [*parallel_sync*]
 #   How many slaves can be reconfigured at the same time to use a
 #   new master after a failover.
 #
 #   Default: 1
 #
 # [*pid_file*]
 #   If sentinel is daemonized it will write its pid at this location.
 #
 #   Default: /var/run/redis/redis-sentinel.pid
 #
 # [*quorum*]
 #   Number of sentinels that must agree that a master is down to
 #   signal sdown state.
 #
 #   Default: 2
 #
 # [*sentinel_bind*]
 #   Allow optional sentinel server ip binding.  Can help overcome
 #   issues arising from protect-mode added Redis 3.2
 #
 #   Default: undef
 #
 # [*sentinel_port*]
 #   The port of sentinel server.
 #
 #   Default: 26379
 #
 # [*service_group*]
 #   The group of the config file.
 #
 #   Default: redis
 #
 # [*service_name*]
 #   The name of the service (for puppet to manage).
 #
 #   Default: redis-sentinel
 #
 # [*service_owner*]
 #   The owner of the config file.
 #
 #   Default: redis
 #
 # [*working_dir*]
 #   The directory into which sentinel will change to avoid mount
 #   conflicts.
 #
 #   Default: /tmp
 #
 # [*notification_script*]
 #   Path to the notification script
 #
 #   Default: undef
 #
 # [*client_reconfig_script*]
 #   Path to the client-reconfig script
 #
 #   Default: undef
 # == Actions:
 #   - Install and configure Redis Sentinel
 #
 # == Sample Usage:
 #
 #   class { 'redis::sentinel': }
 #
 #   class {'redis::sentinel':
 #     down_after => 80000,
 #     log_file => '/var/log/redis/sentinel.log',
 #   }
 #
 class redis::sentinel (
   $auth_pass              = $::redis::params::sentinel_auth_pass,
   $config_file            = $::redis::params::sentinel_config_file,
   $config_file_orig       = $::redis::params::sentinel_config_file_orig,
   $config_file_mode       = $::redis::params::sentinel_config_file_mode,
   $conf_template          = $::redis::params::sentinel_conf_template,
   $daemonize              = $::redis::params::sentinel_daemonize,
   $down_after             = $::redis::params::sentinel_down_after,
   $failover_timeout       = $::redis::params::sentinel_failover_timeout,
   $init_script            = $::redis::params::sentinel_init_script,
   $init_template          = $::redis::params::sentinel_init_template,
   $log_level              = $::redis::params::log_level,
   $log_file               = $::redis::params::log_file,
   $master_name            = $::redis::params::sentinel_master_name,
   $redis_host             = $::redis::params::bind,
   $redis_port             = $::redis::params::port,
   $package_name           = $::redis::params::sentinel_package_name,
   $package_ensure         = $::redis::params::sentinel_package_ensure,
   $parallel_sync          = $::redis::params::sentinel_parallel_sync,
   $pid_file               = $::redis::params::sentinel_pid_file,
   $quorum                 = $::redis::params::sentinel_quorum,
   $sentinel_bind          = $::redis::params::sentinel_bind,
   $sentinel_port          = $::redis::params::sentinel_port,
   $service_group          = $::redis::params::service_group,
   $service_name           = $::redis::params::sentinel_service_name,
   $service_ensure         = $::redis::params::service_ensure,
   $service_user           = $::redis::params::service_user,
   $working_dir            = $::redis::params::sentinel_working_dir,
   $notification_script    = $::redis::params::sentinel_notification_script,
   $client_reconfig_script = $::redis::params::sentinel_client_reconfig_script,
 ) inherits redis::params {
 
   require ::redis
 
   if $::osfamily == 'Debian' {
     # Debian flavour machines have a dedicated redis-sentinel package
-    # This is default in Xenial onwards, unstable debian or PPA/other upstream
+    # This is default in Xenial or Stretch onwards or PPA/other upstream
     # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775414 for context
-    if (versioncmp($::operatingsystemmajrelease, '16.04') >= 0 or $::redis::manage_repo) {
+    if (
+      (versioncmp($::operatingsystemmajrelease, '16.04') >= 0 and $::operatingsystem == 'Ubuntu') or
+      (versioncmp($::operatingsystemmajrelease, '9') >= 0 and $::operatingsystem == 'Debian') or
+      $::redis::manage_repo
+      ) {
       package { $package_name:
         ensure => $package_ensure,
       }
     }
   }
 
   file {
     $config_file_orig:
       ensure  => present,
       owner   => $service_user,
       group   => $service_group,
       mode    => $config_file_mode,
       content => template($conf_template),
       require => Package[$package_name];
   }
 
   exec {
     "cp -p ${config_file_orig} ${config_file}":
       path        => '/usr/bin:/bin',
       subscribe   => File[$config_file_orig],
       notify      => Service[$service_name],
       refreshonly => true;
   }
 
   if $init_script {
 
     file {
       $init_script:
         ensure  => present,
         owner   => 'root',
         group   => 'root',
         mode    => '0755',
         content => template($init_template),
         require => Package[$package_name];
     }
 
     exec {
       '/usr/sbin/update-rc.d redis-sentinel defaults':
         subscribe   => File[$init_script],
         refreshonly => true;
     }
 
   }
 
   service { $service_name:
     ensure     => $service_ensure,
     enable     => $::redis::params::service_enable,
     hasrestart => $::redis::params::service_hasrestart,
     hasstatus  => $::redis::params::service_hasstatus,
   }
 
 }
diff --git a/spec/classes/redis_sentinel_spec.rb b/spec/classes/redis_sentinel_spec.rb
index f0c2152..6d3108d 100644
--- a/spec/classes/redis_sentinel_spec.rb
+++ b/spec/classes/redis_sentinel_spec.rb
@@ -1,90 +1,112 @@
 require 'spec_helper'
 
 $expected_noparams_content = <<EOF
 port 26379
 dir /tmp
 daemonize yes
 pidfile /var/run/redis/redis-sentinel.pid
 
 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 /var/log/redis/redis.log
 EOF
 
 $expected_params_content = <<EOF
 bind 1.2.3.4
 port 26379
 dir /tmp
 daemonize yes
 pidfile /var/run/redis/redis-sentinel.pid
 
 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 bar.sh
 sentinel client-reconfig-script cow foo.sh
 
 loglevel notice
 logfile /tmp/barn-sentinel.log
 EOF
 
 describe 'redis::sentinel', :type => :class do
   let (:facts) { debian_facts }
 
   let :pre_condition do
     [
      'class { redis: }'
     ]
   end
 
   describe 'without parameters' do
 
     it { should create_class('redis::sentinel') }
 
     it { should contain_file('/etc/redis/redis-sentinel.conf.puppet').with(
         'ensure'  => 'present',
         'mode'    => '0644',
         'owner'   => 'redis',
         'content' => $expected_noparams_content
       )
     }
 
     it { should contain_service('redis-sentinel').with(
         'ensure'     => 'running',
         'enable'     => 'true',
         'hasrestart' => 'true',
         'hasstatus'  => 'true',
       )
     }
 
   end
 
   describe 'with custom parameters' do
     let (:params) {
       {
         :auth_pass              => 'password',
         :sentinel_bind          => '1.2.3.4',
         :master_name            => 'cow',
         :down_after             => 6000,
         :log_file               => '/tmp/barn-sentinel.log',
         :failover_timeout       => 28000,
         :notification_script    => 'bar.sh',
         :client_reconfig_script => 'foo.sh'
       }
     }
 
     it { should create_class('redis::sentinel') }
 
     it { should contain_file('/etc/redis/redis-sentinel.conf.puppet').with(
         'content' => $expected_params_content
       )
     }
   end
 
+  describe 'on Debian Jessie' do
+
+    let (:facts) { debian_facts.merge({
+      :operatingsystemmajrelease => '8',
+    }) }
+
+    it { should create_class('redis::sentinel') }
+
+    it { should_not contain_package('redis-sentinel').with_ensure('present') }
+  end
+
+  describe 'on Debian Stretch' do
+
+    let (:facts) { debian_facts.merge({
+      :operatingsystemmajrelease => '9',
+    }) }
+
+    it { should create_class('redis::sentinel') }
+
+    it { should contain_package('redis-sentinel').with_ensure('present') }
+  end
+
 end