diff --git a/Library/Homebrew/test/test_version_subclasses.rb b/Library/Homebrew/test/test_version_subclasses.rb
new file mode 100644
index 0000000000..19ed2ba351
--- /dev/null
+++ b/Library/Homebrew/test/test_version_subclasses.rb
@@ -0,0 +1,41 @@
+require 'testing_env'
+require 'version'
+
+class MacOSVersionTests < Test::Unit::TestCase
+  def setup
+    @v = MacOSVersion.new(10.7)
+  end
+
+  def test_compare_with_symbol
+    assert_operator @v, :>, :snow_leopard
+    assert_operator @v, :==, :lion
+    assert_operator @v, :===, :lion
+    assert_operator @v, :<, :mountain_lion
+  end
+
+  def test_compare_with_fixnum
+    assert_operator @v, :>, 10
+    assert_operator @v, :<, 11
+  end
+
+  def test_compare_with_float
+    assert_operator @v, :>, 10.6
+    assert_operator @v, :==, 10.7
+    assert_operator @v, :===, 10.7
+    assert_operator @v, :<, 10.8
+  end
+
+  def test_compare_with_string
+    assert_operator @v, :>, "10.6"
+    assert_operator @v, :==, "10.7"
+    assert_operator @v, :===, "10.7"
+    assert_operator @v, :<, "10.8"
+  end
+
+  def test_compare_with_version
+    assert_operator @v, :>, Version.new(10.6)
+    assert_operator @v, :==, Version.new(10.7)
+    assert_operator @v, :===, Version.new(10.7)
+    assert_operator @v, :<, Version.new(10.8)
+  end
+end
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb
index bdda4093b4..01b2eb2a28 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test_versions.rb
@@ -33,20 +33,6 @@ class VersionComparisonTests < Test::Unit::TestCase
     assert_nil version('1.0') <=> 'foo'
   end
 
-  def test_macos_version_comparison
-    v = MacOSVersion.new(10.6)
-    assert v == 10.6
-    assert v == :snow_leopard
-    assert v < :lion
-    # Test that we can compare against different representations
-    assert v <= 10.8
-    assert v < "10.8"
-    assert v < :mountain_lion
-    assert v < 11
-    assert v < Version.new(10.8)
-    assert Version.new(10.5) < v
-  end
-
   def test_version_interrogation
     v = Version.new("1.1alpha1")
     assert v.alpha?