9 files changed, 49 insertions, 16 deletions
diff --git a/spec/ruby/core/false/and_spec.rb b/spec/ruby/core/false/and_spec.rb
index a949c02503..0b02ae62c5 100644
--- a/spec/ruby/core/false/and_spec.rb
+++ b/spec/ruby/core/false/and_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "FalseClass#&" do
   it "returns false" do
diff --git a/spec/ruby/core/false/case_compare_spec.rb b/spec/ruby/core/false/case_compare_spec.rb
new file mode 100644
index 0000000000..0bd0ab44ae
--- /dev/null
+++ b/spec/ruby/core/false/case_compare_spec.rb
@@ -0,0 +1,14 @@
+require_relative '../../spec_helper'
+
+describe "FalseClass#===" do
+  it "returns true for false" do
+    (false === false).should == true
+  end
+
+  it "returns false for non-false object" do
+    (false === 0).should == false
+    (false === "").should == false
+    (false === Object).should == false
+    (false === nil).should == false
+  end
+end
diff --git a/spec/ruby/core/false/dup_spec.rb b/spec/ruby/core/false/dup_spec.rb
index b04e641a41..b0eb85529e 100644
--- a/spec/ruby/core/false/dup_spec.rb
+++ b/spec/ruby/core/false/dup_spec.rb
@@ -1,9 +1,7 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
-ruby_version_is '2.4' do
-  describe "FalseClass#dup" do
-    it "returns self" do
-      false.dup.should equal(false)
-    end
+describe "FalseClass#dup" do
+  it "returns self" do
+    false.dup.should.equal?(false)
   end
 end
diff --git a/spec/ruby/core/false/falseclass_spec.rb b/spec/ruby/core/false/falseclass_spec.rb
index e91682c94c..8dfe5ae891 100644
--- a/spec/ruby/core/false/falseclass_spec.rb
+++ b/spec/ruby/core/false/falseclass_spec.rb
@@ -1,15 +1,15 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "FalseClass" do
   it ".allocate raises a TypeError" do
-    lambda do
+    -> do
       FalseClass.allocate
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it ".new is undefined" do
-    lambda do
+    -> do
       FalseClass.new
-    end.should raise_error(NoMethodError)
+    end.should.raise(NoMethodError)
   end
 end
diff --git a/spec/ruby/core/false/inspect_spec.rb b/spec/ruby/core/false/inspect_spec.rb
index f3bb6645bf..4cbb55d434 100644
--- a/spec/ruby/core/false/inspect_spec.rb
+++ b/spec/ruby/core/false/inspect_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "FalseClass#inspect" do
   it "returns the string 'false'" do
diff --git a/spec/ruby/core/false/or_spec.rb b/spec/ruby/core/false/or_spec.rb
index e2f4dbd90b..f3ee1a3439 100644
--- a/spec/ruby/core/false/or_spec.rb
+++ b/spec/ruby/core/false/or_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "FalseClass#|" do
   it "returns false if other is nil or false, otherwise true" do
diff --git a/spec/ruby/core/false/singleton_method_spec.rb b/spec/ruby/core/false/singleton_method_spec.rb
new file mode 100644
index 0000000000..72aee8609a
--- /dev/null
+++ b/spec/ruby/core/false/singleton_method_spec.rb
@@ -0,0 +1,13 @@
+require_relative '../../spec_helper'
+
+describe "FalseClass#singleton_method" do
+  it "raises regardless of whether FalseClass defines the method" do
+    -> { false.singleton_method(:foo) }.should.raise(NameError)
+    begin
+      def (false).foo; end
+      -> { false.singleton_method(:foo) }.should.raise(NameError)
+    ensure
+      FalseClass.send(:remove_method, :foo)
+    end
+  end
+end
diff --git a/spec/ruby/core/false/to_s_spec.rb b/spec/ruby/core/false/to_s_spec.rb
index bb2bdb65af..9e24be26a2 100644
--- a/spec/ruby/core/false/to_s_spec.rb
+++ b/spec/ruby/core/false/to_s_spec.rb
@@ -1,7 +1,15 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "FalseClass#to_s" do
   it "returns the string 'false'" do
     false.to_s.should == "false"
   end
+
+  it "returns a frozen string" do
+    false.to_s.should.frozen?
+  end
+
+  it "always returns the same string" do
+    false.to_s.should.equal?(false.to_s)
+  end
 end
diff --git a/spec/ruby/core/false/xor_spec.rb b/spec/ruby/core/false/xor_spec.rb
index 3e5c452f9b..1b87b9f412 100644
--- a/spec/ruby/core/false/xor_spec.rb
+++ b/spec/ruby/core/false/xor_spec.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "FalseClass#^" do
   it "returns false if other is nil or false, otherwise true" do