diff --git a/manifests/params.pp b/manifests/params.pp
index 4fe4d0902..5024b6731 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -28,7 +28,7 @@
       if $::operatingsystemrelease =~ /^6\./ and versioncmp($::iptables_persistent_version, '0.5.0') < 0 {
         $service = undef
         $package = 'iptables-persistent'
-      } elsif $::operatingsystem == 'Debian' and $::operatingsystemrelease == 'jessie/sid' {
+      } elsif $::operatingsystem == 'Debian' and versioncmp($::operatingsystemrelease, '8.0') >= 0 {
         $service = 'netfilter-persistent'
         $package = 'netfilter-persistent'
       } else {
diff --git a/spec/unit/classes/firewall_linux_debian_spec.rb b/spec/unit/classes/firewall_linux_debian_spec.rb
index 553bac690..f78174355 100644
--- a/spec/unit/classes/firewall_linux_debian_spec.rb
+++ b/spec/unit/classes/firewall_linux_debian_spec.rb
@@ -56,4 +56,32 @@
       :enable   => 'false'
     )}
   end
+
+  context "Debian 8, alt operatingsystem" do
+    let(:facts) {{
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :operatingsystemrelease => '8.0'
+    }}
+    it { should contain_package('netfilter-persistent').with(
+      :ensure => 'present'
+    )}
+    it { should contain_service('netfilter-persistent').with(
+      :ensure   => nil,
+      :enable   => 'true',
+      :require  => 'Package[netfilter-persistent]'
+    )}
+  end
+
+  context 'deb8, alt operatingsystem, enable => false' do
+    let(:facts) {{
+        :osfamily               => 'Debian',
+        :operatingsystem        => 'Debian',
+        :operatingsystemrelease => '8.0'
+    }}
+    let(:params) {{ :enable => 'false' }}
+    it { should contain_service('netfilter-persistent').with(
+      :enable   => 'false'
+    )}
+  end
 end