diff --git a/Library/Homebrew/test/os/mac/bottle_collector_test.rb b/Library/Homebrew/test/os/mac/bottle_collector_test.rb
deleted file mode 100644
index e9ae9b7537..0000000000
--- a/Library/Homebrew/test/os/mac/bottle_collector_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require "testing_env"
-require "utils/bottles"
-
-class OSMacBottleCollectorTests < Homebrew::TestCase
-  def setup
-    super
-    @collector = Utils::Bottles::Collector.new
-  end
-
-  def checksum_for(tag)
-    @collector.fetch_checksum_for(tag)
-  end
-
-  def test_collector_finds_or_later_tags
-    @collector[:lion_or_later] = "foo"
-    assert_equal ["foo", :lion_or_later], checksum_for(:mountain_lion)
-    assert_nil checksum_for(:snow_leopard)
-  end
-
-  def test_collector_finds_altivec_tags
-    @collector[:tiger_altivec] = "foo"
-    assert_equal ["foo", :tiger_altivec], checksum_for(:tiger_g4)
-    assert_equal ["foo", :tiger_altivec], checksum_for(:tiger_g4e)
-    assert_equal ["foo", :tiger_altivec], checksum_for(:tiger_g5)
-    assert_nil checksum_for(:tiger_g3)
-  end
-end
diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
index 292c5786aa..6ffbf5c8e1 100644
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@@ -29,6 +29,11 @@ TEST_DIRECTORIES = [
 RSpec.configure do |config|
   config.order = :random
   config.include(Test::Helper::Shutup)
+  config.before(:each) do |example|
+    if example.metadata[:needs_macos]
+      skip "not on macOS" unless OS.mac?
+    end
+  end
   config.around(:each) do |example|
     begin
       TEST_DIRECTORIES.each(&:mkpath)
diff --git a/Library/Homebrew/test/utils/bottles/collector_spec.rb b/Library/Homebrew/test/utils/bottles/collector_spec.rb
index 73757234eb..08484e5455 100644
--- a/Library/Homebrew/test/utils/bottles/collector_spec.rb
+++ b/Library/Homebrew/test/utils/bottles/collector_spec.rb
@@ -27,5 +27,19 @@ describe Utils::Bottles::Collector do
       subject[:mountain_lion] = "bar"
       expect(subject.fetch_checksum_for(:mountain_lion)).to eq(["bar", :mountain_lion])
     end
+
+    it "finds '_or_later' tags", :needs_macos do
+      subject[:lion_or_later] = "foo"
+      expect(subject.fetch_checksum_for(:mountain_lion)).to eq(["foo", :lion_or_later])
+      expect(subject.fetch_checksum_for(:snow_leopard)).to be nil
+    end
+
+    it "finds '_altivec' tags", :needs_macos do
+      subject[:tiger_altivec] = "foo"
+      expect(subject.fetch_checksum_for(:tiger_g4)).to eq(["foo", :tiger_altivec])
+      expect(subject.fetch_checksum_for(:tiger_g4e)).to eq(["foo", :tiger_altivec])
+      expect(subject.fetch_checksum_for(:tiger_g5)).to eq(["foo", :tiger_altivec])
+      expect(subject.fetch_checksum_for(:tiger_g3)).to be nil
+    end
   end
 end