6 files changed, 21 insertions, 12 deletions
diff --git a/spec/ruby/core/false/dup_spec.rb b/spec/ruby/core/false/dup_spec.rb
index 1a569a2f4f..b0eb85529e 100644
--- a/spec/ruby/core/false/dup_spec.rb
+++ b/spec/ruby/core/false/dup_spec.rb
@@ -2,6 +2,6 @@ require_relative '../../spec_helper'
 
 describe "FalseClass#dup" do
   it "returns self" do
-    false.dup.should equal(false)
+    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 c018ef2421..8dfe5ae891 100644
--- a/spec/ruby/core/false/falseclass_spec.rb
+++ b/spec/ruby/core/false/falseclass_spec.rb
@@ -4,12 +4,12 @@ describe "FalseClass" do
   it ".allocate raises a TypeError" do
     -> do
       FalseClass.allocate
-    end.should raise_error(TypeError)
+    end.should.raise(TypeError)
   end
 
   it ".new is undefined" 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 4cbb55d434..70f4aa0159 100644
--- a/spec/ruby/core/false/inspect_spec.rb
+++ b/spec/ruby/core/false/inspect_spec.rb
@@ -1,7 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "FalseClass#inspect" do
-  it "returns the string 'false'" do
-    false.inspect.should == "false"
+  it "is an alias of FalseClass#to_s" do
+    false.method(:inspect).should == false.method(:to_s)
   end
 end
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 62f67f6f55..9e24be26a2 100644
--- a/spec/ruby/core/false/to_s_spec.rb
+++ b/spec/ruby/core/false/to_s_spec.rb
@@ -10,6 +10,6 @@ describe "FalseClass#to_s" do
   end
 
   it "always returns the same string" do
-    false.to_s.should equal(false.to_s)
+    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 1b87b9f412..d8432ca326 100644
--- a/spec/ruby/core/false/xor_spec.rb
+++ b/spec/ruby/core/false/xor_spec.rb
@@ -1,11 +1,7 @@
 require_relative '../../spec_helper'
 
 describe "FalseClass#^" do
-  it "returns false if other is nil or false, otherwise true" do
-    (false ^ false).should == false
-    (false ^ true).should == true
-    (false ^ nil).should == false
-    (false ^ "").should == true
-    (false ^ mock('x')).should == true
+  it "is an alias of FalseClass#|" do
+    false.method(:^).should == false.method(:|)
   end
 end