diff --git a/lib/pdk/tests/unit.rb b/lib/pdk/tests/unit.rb
index 450b5e3b8..9610f07f2 100644
--- a/lib/pdk/tests/unit.rb
+++ b/lib/pdk/tests/unit.rb
@@ -246,10 +246,10 @@ def self.list(options = {})
         raise PDK::CLI::FatalError, format('Failed to find valid JSON in output from rspec: %{output}', output: output[:stdout]) unless rspec_json
 
         if rspec_json['examples'].empty?
-          rspec_message = rspec_json['messages'][0]
-          return [] if rspec_message == 'No examples found.'
+          return [] if rspec_json['messages'][0] == 'No examples found.'
+          return [] if rspec_json['messages'].include?("\nAll examples were filtered out")
 
-          raise PDK::CLI::FatalError, format('Unable to enumerate examples. rspec reported: %{message}', message: rspec_message)
+          raise PDK::CLI::FatalError, format('Unable to enumerate examples. rspec reported: %{message}', message: rspec_json['messages'])
         else
           examples = []
           rspec_json['examples'].each do |example|
diff --git a/spec/acceptance/test_unit_spec.rb b/spec/acceptance/test_unit_spec.rb
index 5312ec922..c74f1a0bc 100644
--- a/spec/acceptance/test_unit_spec.rb
+++ b/spec/acceptance/test_unit_spec.rb
@@ -47,11 +47,9 @@
         require 'spec_helper'
 
         RSpec.describe 'passing test' do
-          on_supported_os(:facterversion => '2.4.6').each do |os, facts|
-            context "On OS \#{os}" do
-              it 'should pass' do
-                expect(true).to eq(true)
-              end
+          context 'On OS' do
+            it 'should pass' do
+              expect(true).to eq(true)
             end
           end
         end