diff --git a/Library/Homebrew/test/java_requirement_spec.rb b/Library/Homebrew/test/java_requirement_spec.rb
new file mode 100644
index 0000000000..5adf64c7c2
--- /dev/null
+++ b/Library/Homebrew/test/java_requirement_spec.rb
@@ -0,0 +1,107 @@
+require "requirements/java_requirement"
+
+describe JavaRequirement do
+  subject { described_class.new([]) }
+
+  before(:each) do
+    ENV["JAVA_HOME"] = nil
+  end
+
+  describe "#message" do
+    its(:message) { is_expected.to match(/Java is required to install this formula./) }
+  end
+
+  describe "#inspect" do
+    subject { described_class.new(%w[1.7+]) }
+    its(:inspect) { is_expected.to eq('#<JavaRequirement: "java" [] version="1.7+">') }
+  end
+
+  describe "#display_s" do
+    context "without specific version" do
+      its(:display_s) { is_expected.to eq("java") }
+    end
+
+    context "with version 1.8" do
+      subject { described_class.new(%w[1.8]) }
+      its(:display_s) { is_expected.to eq("java = 1.8") }
+    end
+
+    context "with version 1.8+" do
+      subject { described_class.new(%w[1.8+]) }
+      its(:display_s) { is_expected.to eq("java >= 1.8") }
+    end
+  end
+
+  describe "#satisfied?" do
+    subject { described_class.new(%w[1.8]) }
+
+    it "returns false if no `java` executable can be found" do
+      allow(File).to receive(:executable?).and_return(false)
+      expect(subject).not_to be_satisfied
+    end
+
+    it "returns true if #preferred_java returns a path" do
+      allow(subject).to receive(:preferred_java).and_return(Pathname.new("/usr/bin/java"))
+      expect(subject).to be_satisfied
+    end
+
+    context "when #possible_javas contains paths" do
+      let(:path) { Pathname.new(Dir.mktmpdir) }
+      let(:java) { path/"java" }
+
+      def setup_java_with_version(version)
+        IO.write java, <<-EOS.undent
+          #!/bin/sh
+          echo 'java version "#{version}"'
+        EOS
+        FileUtils.chmod "+x", java
+      end
+
+      before(:each) do
+        allow(subject).to receive(:possible_javas).and_return([java])
+      end
+
+      after(:each) do
+        path.rmtree
+      end
+
+      context "and 1.7 is required" do
+        subject { described_class.new(%w[1.7]) }
+
+        it "returns false if all are lower" do
+          setup_java_with_version "1.6.0_5"
+          expect(subject).not_to be_satisfied
+        end
+
+        it "returns true if one is equal" do
+          setup_java_with_version "1.7.0_5"
+          expect(subject).to be_satisfied
+        end
+
+        it "returns false if all are higher" do
+          setup_java_with_version "1.8.0_5"
+          expect(subject).not_to be_satisfied
+        end
+      end
+
+      context "and 1.7+ is required" do
+        subject { described_class.new(%w[1.7+]) }
+
+        it "returns false if all are lower" do
+          setup_java_with_version "1.6.0_5"
+          expect(subject).not_to be_satisfied
+        end
+
+        it "returns true if one is equal" do
+          setup_java_with_version "1.7.0_5"
+          expect(subject).to be_satisfied
+        end
+
+        it "returns true if one is higher" do
+          setup_java_with_version "1.8.0_5"
+          expect(subject).to be_satisfied
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/java_requirement_test.rb b/Library/Homebrew/test/java_requirement_test.rb
deleted file mode 100644
index d0b51f92cf..0000000000
--- a/Library/Homebrew/test/java_requirement_test.rb
+++ /dev/null
@@ -1,50 +0,0 @@
-require "testing_env"
-require "requirements/java_requirement"
-
-class JavaRequirementTests < Homebrew::TestCase
-  def setup
-    super
-    ENV["JAVA_HOME"] = nil
-  end
-
-  def test_message
-    a = JavaRequirement.new([])
-    assert_match(/Java is required to install this formula./, a.message)
-  end
-
-  def test_inspect
-    a = JavaRequirement.new(%w[1.7+])
-    assert_equal a.inspect, '#<JavaRequirement: "java" [] version="1.7+">'
-  end
-
-  def test_display_s
-    x = JavaRequirement.new([])
-    assert_equal x.display_s, "java"
-    y = JavaRequirement.new(%w[1.8])
-    assert_equal y.display_s, "java = 1.8"
-    z = JavaRequirement.new(%w[1.8+])
-    assert_equal z.display_s, "java >= 1.8"
-  end
-
-  def test_satisfied?
-    a = JavaRequirement.new(%w[1.8])
-    File.stubs(:executable?).returns(false)
-    refute_predicate a, :satisfied?
-
-    b = JavaRequirement.new([])
-    b.stubs(:preferred_java).returns(Pathname.new("/usr/bin/java"))
-    assert_predicate b, :satisfied?
-
-    c = JavaRequirement.new(%w[1.7+])
-    c.stubs(:possible_javas).returns([Pathname.new("/usr/bin/java")])
-    Utils.stubs(:popen_read).returns('java version "1.6.0_5"')
-    refute_predicate c, :satisfied?
-    Utils.stubs(:popen_read).returns('java version "1.8.0_5"')
-    assert_predicate c, :satisfied?
-
-    d = JavaRequirement.new(%w[1.7])
-    d.stubs(:possible_javas).returns([Pathname.new("/usr/bin/java")])
-    Utils.stubs(:popen_read).returns('java version "1.8.0_5"')
-    refute_predicate d, :satisfied?
-  end
-end