4 files changed, 14 insertions, 0 deletions
diff --git a/spec/ruby/core/module/const_added_spec.rb b/spec/ruby/core/module/const_added_spec.rb
index 739be3ead8..90cd36551a 100644
--- a/spec/ruby/core/module/const_added_spec.rb
+++ b/spec/ruby/core/module/const_added_spec.rb
@@ -117,6 +117,7 @@ describe "Module#const_added" do
     end
 
     ScratchPad.recorded.should == [:A, :B]
+    ModuleSpecs::ConstAddedSpecs.send :remove_const, :NamedModule
   end
 
   it "is called when a new class is defined under self" do
@@ -158,6 +159,7 @@ describe "Module#const_added" do
     end
 
     ScratchPad.recorded.should == [:A, :B]
+    ModuleSpecs::ConstAddedSpecs.send :remove_const, :NamedModuleB
   end
 
   it "is called when an autoload is defined" do
diff --git a/spec/ruby/core/module/const_source_location_spec.rb b/spec/ruby/core/module/const_source_location_spec.rb
index 06b3b215c2..96649ea10b 100644
--- a/spec/ruby/core/module/const_source_location_spec.rb
+++ b/spec/ruby/core/module/const_source_location_spec.rb
@@ -245,6 +245,14 @@ describe "Module#const_source_location" do
       @line = __LINE__ - 1
     end
 
+    before :each do
+      @loaded_features = $".dup
+    end
+
+    after :each do
+      $".replace @loaded_features
+    end
+
     it 'returns the autoload location while not resolved' do
       ConstantSpecs.const_source_location('CSL_CONST1').should == [__FILE__, @line]
     end
@@ -265,6 +273,8 @@ describe "Module#const_source_location" do
         ConstantSpecs.const_source_location(:ConstSource).should == autoload_location
         ConstantSpecs::ConstSource::LOCATION.should == ConstantSpecs.const_source_location(:ConstSource)
         ConstantSpecs::BEFORE_DEFINE_LOCATION.should == autoload_location
+        ConstantSpecs.send :remove_const, :ConstSource
+        ConstantSpecs.send :remove_const, :BEFORE_DEFINE_LOCATION
       end
     end
   end
diff --git a/spec/ruby/core/module/name_spec.rb b/spec/ruby/core/module/name_spec.rb
index fd28ee0a33..d3318e1645 100644
--- a/spec/ruby/core/module/name_spec.rb
+++ b/spec/ruby/core/module/name_spec.rb
@@ -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
diff --git a/spec/ruby/core/module/set_temporary_name_spec.rb b/spec/ruby/core/module/set_temporary_name_spec.rb
index 12c1c214dd..624b02c90e 100644
--- a/spec/ruby/core/module/set_temporary_name_spec.rb
+++ b/spec/ruby/core/module/set_temporary_name_spec.rb
@@ -86,6 +86,7 @@ ruby_version_is "3.3" do
 
       ModuleSpecs::SetTemporaryNameSpec::M = m
       m::N.name.should == "ModuleSpecs::SetTemporaryNameSpec::M::N"
+      ModuleSpecs::SetTemporaryNameSpec.send :remove_const, :M
     end
 
     it "can update the name when assigned to a constant" do