11 files changed, 5 insertions, 24 deletions
diff --git a/spec/ruby/fixtures/code/a/load_fixture.dylib b/spec/ruby/fixtures/code/a/load_fixture.dylib
deleted file mode 100644
index 31f4b1a7bb..0000000000
--- a/spec/ruby/fixtures/code/a/load_fixture.dylib
+++ /dev/null
@@ -1 +0,0 @@
-ScratchPad << :ext_dylib
diff --git a/spec/ruby/fixtures/code/c/load_fixture.rb b/spec/ruby/fixtures/code/c/load_fixture.rb
deleted file mode 100644
index 4a6e9c9601..0000000000
--- a/spec/ruby/fixtures/code/c/load_fixture.rb
+++ /dev/null
@@ -1 +0,0 @@
-ScratchPad << :loaded
diff --git a/spec/ruby/fixtures/code/concurrent.rb b/spec/ruby/fixtures/code/concurrent.rb
index b3602a3db4..054b8fc055 100644
--- a/spec/ruby/fixtures/code/concurrent.rb
+++ b/spec/ruby/fixtures/code/concurrent.rb
@@ -2,7 +2,7 @@ ScratchPad.recorded << :con_pre
 Thread.current[:in_concurrent_rb] = true
 
 if t = Thread.current[:wait_for]
-  Thread.pass until t.backtrace && t.backtrace.any? { |call| call.include? 'require' } && t.stop?
+  Thread.pass until t.backtrace && t.backtrace.any? { |call| call.include? 'require' }
 end
 
 if Thread.current[:con_raise]
diff --git a/spec/ruby/fixtures/code/concurrent_require_fixture.rb b/spec/ruby/fixtures/code/concurrent_require_fixture.rb
deleted file mode 100644
index d4ce734183..0000000000
--- a/spec/ruby/fixtures/code/concurrent_require_fixture.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-object = ScratchPad.recorded
-thread = Thread.new { object.require(__FILE__) }
-Thread.pass until thread.stop?
-ScratchPad.record(thread)
diff --git a/spec/ruby/fixtures/code/d/load_fixture.rb.rb b/spec/ruby/fixtures/code/d/load_fixture.rb.rb
deleted file mode 100644
index 7e9217729a..0000000000
--- a/spec/ruby/fixtures/code/d/load_fixture.rb.rb
+++ /dev/null
@@ -1 +0,0 @@
-ScratchPad << :rbrb
diff --git a/spec/ruby/fixtures/code/load_fixture.dylib b/spec/ruby/fixtures/code/load_fixture.dylib
deleted file mode 100644
index 31f4b1a7bb..0000000000
--- a/spec/ruby/fixtures/code/load_fixture.dylib
+++ /dev/null
@@ -1 +0,0 @@
-ScratchPad << :ext_dylib
diff --git a/spec/ruby/fixtures/code/load_fixture.ext.dylib b/spec/ruby/fixtures/code/load_fixture.ext.dylib
deleted file mode 100644
index 31f4b1a7bb..0000000000
--- a/spec/ruby/fixtures/code/load_fixture.ext.dylib
+++ /dev/null
@@ -1 +0,0 @@
-ScratchPad << :ext_dylib
diff --git a/spec/ruby/fixtures/code/load_fixture_and__FILE__.rb b/spec/ruby/fixtures/code/load_fixture_and__FILE__.rb
deleted file mode 100644
index 27388c7d8d..0000000000
--- a/spec/ruby/fixtures/code/load_fixture_and__FILE__.rb
+++ /dev/null
@@ -1 +0,0 @@
-ScratchPad << __FILE__
diff --git a/spec/ruby/fixtures/code/load_wrap_fixture.rb b/spec/ruby/fixtures/code/load_wrap_fixture.rb
deleted file mode 100644
index 526bbf8c82..0000000000
--- a/spec/ruby/fixtures/code/load_wrap_fixture.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-class LoadSpecWrap
-  ScratchPad << String
-end
-
-LOAD_WRAP_SPECS_TOP_LEVEL_CONSTANT = 1
-
-def load_wrap_specs_top_level_method
-  :load_wrap_specs_top_level_method
-end
-ScratchPad << method(:load_wrap_specs_top_level_method).owner
-
-ScratchPad << self
diff --git a/spec/ruby/fixtures/code/recursive_require_fixture.rb b/spec/ruby/fixtures/code/recursive_require_fixture.rb
index ebeba34fce..8842a6ad74 100644
--- a/spec/ruby/fixtures/code/recursive_require_fixture.rb
+++ b/spec/ruby/fixtures/code/recursive_require_fixture.rb
@@ -1,3 +1,3 @@
-require_relative 'recursive_require_fixture'
+require File.expand_path("../recursive_require_fixture.rb", __FILE__)
 
 ScratchPad << :loaded
diff --git a/spec/ruby/fixtures/code/wrap_fixture.rb b/spec/ruby/fixtures/code/wrap_fixture.rb
new file mode 100644
index 0000000000..b83a8970d7
--- /dev/null
+++ b/spec/ruby/fixtures/code/wrap_fixture.rb
@@ -0,0 +1,3 @@
+class LoadSpecWrap
+  ScratchPad << self
+end