diff --git a/lib/cucumber/core.rb b/lib/cucumber/core.rb
index b2ace44c..a2ba1f9b 100644
--- a/lib/cucumber/core.rb
+++ b/lib/cucumber/core.rb
@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/event_bus'
-require 'cucumber/core/gherkin/parser'
-require 'cucumber/core/gherkin/document'
-require 'cucumber/core/compiler'
-require 'cucumber/core/test/runner'
+require_relative 'core/gherkin/parser'
+require_relative 'core/gherkin/document'
+require_relative 'core/test/runner'
+require_relative 'core/compiler'
+require_relative 'core/event_bus'
+
 require 'cucumber/messages'
 require 'gherkin/query'
 
diff --git a/lib/cucumber/core/compiler.rb b/lib/cucumber/core/compiler.rb
index 7cfecf02..7f2388dc 100644
--- a/lib/cucumber/core/compiler.rb
+++ b/lib/cucumber/core/compiler.rb
@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/test/case'
-require 'cucumber/core/test/data_table'
-require 'cucumber/core/test/doc_string'
-require 'cucumber/core/test/empty_multiline_argument'
-require 'cucumber/core/test/hook_step'
-require 'cucumber/core/test/step'
-require 'cucumber/core/test/tag'
+require_relative 'test/case'
+require_relative 'test/data_table'
+require_relative 'test/doc_string'
+require_relative 'test/empty_multiline_argument'
+require_relative 'test/hook_step'
+require_relative 'test/step'
+require_relative 'test/tag'
+
 require 'cucumber/messages'
 
 module Cucumber
diff --git a/lib/cucumber/core/event_bus.rb b/lib/cucumber/core/event_bus.rb
index 791d54f7..f317944e 100644
--- a/lib/cucumber/core/event_bus.rb
+++ b/lib/cucumber/core/event_bus.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/events'
+require_relative 'events'
 
 module Cucumber
   module Core
diff --git a/lib/cucumber/core/test/action/defined.rb b/lib/cucumber/core/test/action/defined.rb
index 3bd90ddf..078b6d2f 100644
--- a/lib/cucumber/core/test/action/defined.rb
+++ b/lib/cucumber/core/test/action/defined.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/test/location'
-require 'cucumber/core/test/result'
-require 'cucumber/core/test/timer'
+require_relative '../location'
+require_relative '../result'
+require_relative '../timer'
 
 module Cucumber
   module Core
diff --git a/lib/cucumber/core/test/filters.rb b/lib/cucumber/core/test/filters.rb
index 45238dee..80b88177 100644
--- a/lib/cucumber/core/test/filters.rb
+++ b/lib/cucumber/core/test/filters.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/test/filters/locations_filter'
-require 'cucumber/core/test/filters/name_filter'
-require 'cucumber/core/test/filters/tag_filter'
+require_relative 'filters/locations_filter'
+require_relative 'filters/name_filter'
+require_relative 'filters/tag_filter'
diff --git a/lib/cucumber/core/test/filters/locations_filter.rb b/lib/cucumber/core/test/filters/locations_filter.rb
index cba105f6..95a70250 100644
--- a/lib/cucumber/core/test/filters/locations_filter.rb
+++ b/lib/cucumber/core/test/filters/locations_filter.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/filter'
+require_relative '../../filter'
 
 module Cucumber
   module Core
diff --git a/lib/cucumber/core/test/filters/name_filter.rb b/lib/cucumber/core/test/filters/name_filter.rb
index 8af242e1..9b67cf40 100644
--- a/lib/cucumber/core/test/filters/name_filter.rb
+++ b/lib/cucumber/core/test/filters/name_filter.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/filter'
+require_relative '../../filter'
 
 module Cucumber
   module Core
diff --git a/lib/cucumber/core/test/filters/tag_filter.rb b/lib/cucumber/core/test/filters/tag_filter.rb
index 676e812c..f53cffad 100644
--- a/lib/cucumber/core/test/filters/tag_filter.rb
+++ b/lib/cucumber/core/test/filters/tag_filter.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/filter'
+require_relative '../../filter'
 
 module Cucumber
   module Core
diff --git a/lib/cucumber/core/test/hook_step.rb b/lib/cucumber/core/test/hook_step.rb
index 3667c5ae..cebafd42 100644
--- a/lib/cucumber/core/test/hook_step.rb
+++ b/lib/cucumber/core/test/hook_step.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/test/step'
+require_relative 'step'
 
 module Cucumber
   module Core
diff --git a/lib/cucumber/core/test/runner.rb b/lib/cucumber/core/test/runner.rb
index 58c90deb..cf329c40 100644
--- a/lib/cucumber/core/test/runner.rb
+++ b/lib/cucumber/core/test/runner.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cucumber/core/test/timer'
+require_relative 'timer'
 
 module Cucumber
   module Core