1 files changed, 7 insertions, 6 deletions
diff --git a/spec/ruby/core/module/name_spec.rb b/spec/ruby/core/module/name_spec.rb
index fd28ee0a33..332c08d782 100644
--- a/spec/ruby/core/module/name_spec.rb
+++ b/spec/ruby/core/module/name_spec.rb
@@ -3,7 +3,7 @@ require_relative 'fixtures/module'
 
 describe "Module#name" do
   it "is nil for an anonymous module" do
-    Module.new.name.should be_nil
+    Module.new.name.should == nil
   end
 
   it "is not nil when assigned to a constant in an anonymous module" do
@@ -19,9 +19,9 @@ describe "Module#name" do
   end
 
   it "returns nil for a singleton class" do
-    Module.new.singleton_class.name.should be_nil
-    String.singleton_class.name.should be_nil
-    Object.new.singleton_class.name.should be_nil
+    Module.new.singleton_class.name.should == nil
+    String.singleton_class.name.should == nil
+    Object.new.singleton_class.name.should == nil
   end
 
   it "changes when the module is reachable through a constant path" do
@@ -148,7 +148,7 @@ describe "Module#name" do
       "ModuleSpecs::Anonymous::StoredInMultiplePlaces::N",
       "ModuleSpecs::Anonymous::StoredInMultiplePlaces::O"
     ]
-    valid_names.should include(m::N.name) # You get one of the two, but you don't know which one.
+    valid_names.should.include?(m::N.name) # You get one of the two, but you don't know which one.
   ensure
     ModuleSpecs::Anonymous.send(:remove_const, :StoredInMultiplePlaces)
   end
@@ -190,6 +190,7 @@ describe "Module#name" do
 
     ScratchPad.recorded.should.one?(/#<Module.+>::A$/)
     ScratchPad.recorded.should.one?(/#<Module.+>::A::B$/)
+    ModuleSpecs::NameSpecs.send :remove_const, :NamedModule
   end
 
   it "returns a frozen String" do
@@ -199,6 +200,6 @@ describe "Module#name" do
   it "always returns the same String for a given Module" do
     s1 = ModuleSpecs.name
     s2 = ModuleSpecs.name
-    s1.should equal(s2)
+    s1.should.equal?(s2)
   end
 end