diff --git a/ChangeLog b/ChangeLog
index 897d7a89cf..f09329e55e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  9 03:35:22 2016  Charles Oliver Nutter  <headius@headius.com>
+
+	* test/ruby/test_require.rb (test_require_with_loaded_features_pop):
+	  Only remove PATH so threads don't accidentally double-pop.
+
 Wed Mar  9 00:29:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_method.c (rb_alias): the original name should be properly
diff --git a/test/ruby/test_require.rb b/test/ruby/test_require.rb
index a7db8b93e0..818db4b6d3 100644
--- a/test/ruby/test_require.rb
+++ b/test/ruby/test_require.rb
@@ -686,7 +686,7 @@ class TestRequire < Test::Unit::TestCase
           Thread.new do
             ITERATIONS_PER_THREAD.times do
               require PATH
-              $".pop
+              $".delete_if {|p| Regexp.new(PATH) =~ p}
             end
           end
         }.each(&:join)