diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test_keg.rb
index c9e5990a05..e4fa4f2770 100644
--- a/Library/Homebrew/test/test_keg.rb
+++ b/Library/Homebrew/test/test_keg.rb
@@ -19,26 +19,25 @@ class LinkTests < Test::Unit::TestCase
   end
 
   def test_linking_keg
-    assert_equal @keg.link, 3
+    assert_equal 3, @keg.link
   end
 
   def test_unlinking_keg
     @keg.link
-    assert_equal @keg.unlink, 3
+    assert_equal 3, @keg.unlink
   end
 
   def test_link_dry_run
     mode = OpenStruct.new
     mode.dry_run = true
 
-    assert_equal @keg.link(mode), 0
+    assert_equal 0, @keg.link(mode)
     assert !@keg.linked?
 
-    assert_equal $stdout.string, <<-EOS.undent
-      /private/tmp/testbrew/prefix/bin/hiworld
-      /private/tmp/testbrew/prefix/bin/helloworld
-      /private/tmp/testbrew/prefix/bin/goodbye_cruel_world
-      EOS
+    ['hiworld', 'helloworld', 'goodbye_cruel_world'].each do |file|
+      assert_match "/private/tmp/testbrew/prefix/bin/#{file}", $stdout.string
+    end
+    assert_equal 3, $stdout.string.lines.count
   end
 
   def test_linking_fails_when_already_linked
@@ -59,7 +58,7 @@ class LinkTests < Test::Unit::TestCase
     FileUtils.touch HOMEBREW_PREFIX/"bin/helloworld"
     mode = OpenStruct.new
     mode.overwrite = true
-    assert_equal @keg.link(mode), 3
+    assert_equal 3, @keg.link(mode)
   end
 
   def test_link_overwrite_dryrun
@@ -68,10 +67,10 @@ class LinkTests < Test::Unit::TestCase
     mode.overwrite = true
     mode.dry_run = true
 
-    assert_equal @keg.link(mode), 0
+    assert_equal 0, @keg.link(mode)
     assert !@keg.linked?
 
-    assert_equal $stdout.string, "/private/tmp/testbrew/prefix/bin/helloworld\n"
+    assert_equal "/private/tmp/testbrew/prefix/bin/helloworld\n", $stdout.string
   end
 
   def teardown