5 files changed, 17 insertions, 14 deletions
diff --git a/spec/ruby/core/filetest/empty_spec.rb b/spec/ruby/core/filetest/empty_spec.rb
new file mode 100644
index 0000000000..2c7fbe0dcd
--- /dev/null
+++ b/spec/ruby/core/filetest/empty_spec.rb
@@ -0,0 +1,7 @@
+require_relative '../../spec_helper'
+require_relative '../../shared/file/zero'
+
+describe "FileTest.empty?" do
+  it_behaves_like :file_zero, :empty?, FileTest
+  it_behaves_like :file_zero_missing, :empty?, FileTest
+end
diff --git a/spec/ruby/core/filetest/exist_spec.rb b/spec/ruby/core/filetest/exist_spec.rb
index a95d3f91a1..612ffa9fcb 100644
--- a/spec/ruby/core/filetest/exist_spec.rb
+++ b/spec/ruby/core/filetest/exist_spec.rb
@@ -5,10 +5,8 @@ describe "FileTest.exist?" do
   it_behaves_like :file_exist, :exist?, FileTest
 end
 
-ruby_version_is "3.2" do
-  describe "FileTest.exists?" do
-    it "has been removed" do
-      FileTest.should_not.respond_to?(:exists?)
-    end
+describe "FileTest.exists?" do
+  it "has been removed" do
+    FileTest.should_not.respond_to?(:exists?)
   end
 end
diff --git a/spec/ruby/core/filetest/grpowned_spec.rb b/spec/ruby/core/filetest/grpowned_spec.rb
index d073cb9770..d6bd6abd71 100644
--- a/spec/ruby/core/filetest/grpowned_spec.rb
+++ b/spec/ruby/core/filetest/grpowned_spec.rb
@@ -5,6 +5,6 @@ describe "FileTest.grpowned?" do
   it_behaves_like :file_grpowned, :grpowned?, FileTest
 
   it "returns false if the file doesn't exist" do
-    FileTest.grpowned?("xxx-tmp-doesnt_exist-blah").should be_false
+    FileTest.grpowned?("xxx-tmp-doesnt_exist-blah").should == false
   end
 end
diff --git a/spec/ruby/core/filetest/socket_spec.rb b/spec/ruby/core/filetest/socket_spec.rb
index 63a6a31ecb..f274be6318 100644
--- a/spec/ruby/core/filetest/socket_spec.rb
+++ b/spec/ruby/core/filetest/socket_spec.rb
@@ -3,4 +3,8 @@ require_relative '../../shared/file/socket'
 
 describe "FileTest.socket?" do
   it_behaves_like :file_socket, :socket?, FileTest
+
+  it "returns false if file does not exist" do
+    FileTest.socket?("I_am_a_bogus_file").should == false
+  end
 end
diff --git a/spec/ruby/core/filetest/zero_spec.rb b/spec/ruby/core/filetest/zero_spec.rb
index dd6a164ec9..de024c25ff 100644
--- a/spec/ruby/core/filetest/zero_spec.rb
+++ b/spec/ruby/core/filetest/zero_spec.rb
@@ -1,13 +1,7 @@
 require_relative '../../spec_helper'
-require_relative '../../shared/file/zero'
 
 describe "FileTest.zero?" do
-  it_behaves_like :file_zero, :zero?, FileTest
-  it_behaves_like :file_zero_missing, :zero?, FileTest
-
-  platform_is :solaris do
-    it "returns false for /dev/null" do
-      File.zero?('/dev/null').should == true
-    end
+  it "is an alias of FileTest.empty?" do
+    FileTest.method(:zero?).should == FileTest.method(:empty?)
   end
 end