diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c53e0c0..6cb7a5a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,10 +1,3 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
-# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
-
 name: Ruby
 
 on:
@@ -20,16 +13,11 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         ruby:
-          - 2.5
-          - 2.6
-          - 2.7
+          - '2.7'
           - '3.0'
-          - 3.1
-          - 3.2
-          - 3.3
-        include:
-          - os: macos-13
-            ruby: 2.5
+          - '3.1'
+          - '3.2'
+          - '3.3'
     name: Ruby ${{ matrix.ruby }} test (${{ matrix.os }})
     steps:
     - uses: actions/checkout@v4
@@ -60,6 +48,6 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.5
+          ruby-version: 2.7
           bundler-cache: true
       - run: bin/test/${{ matrix.repo }}
diff --git a/Gemfile b/Gemfile
index d93c6e89..fb9080fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in retest.gemspec
 gemspec
-
-gem "rake", "~> 13.0"
-gem "minitest", "~> 5.0"
-gem "byebug"
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 599f2bd6..8f7fc9f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,28 +10,41 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    byebug (11.1.3)
-    ffi (1.17.0)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    ffi (1.16.3)
+    io-console (0.7.2)
+    irb (1.14.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    minitest (5.15.0)
+    minitest (5.25.1)
     observer (0.1.2)
-    rake (13.0.6)
+    psych (5.1.2)
+      stringio
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    reline (0.5.10)
+      io-console (~> 0.5)
     string-similarity (2.1.0)
+    stringio (3.1.1)
     tty-option (0.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  byebug
+  debug
   minitest (~> 5.0)
   rake (~> 13.0)
   retest!
 
 BUNDLED WITH
-   2.3.22
+   2.1.4
diff --git a/bin/debug b/bin/debug
index abab9daa..eb44c48c 100755
--- a/bin/debug
+++ b/bin/debug
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "byebug"
+require "debugger"
 
 begin
   eval(File.read("exe/retest"))
diff --git a/features/git-ruby/Dockerfile b/features/git-ruby/Dockerfile
index f52b6c3f..f6589036 100644
--- a/features/git-ruby/Dockerfile
+++ b/features/git-ruby/Dockerfile
@@ -1,4 +1,5 @@
-FROM ruby:2.5.9-alpine3.13
+
+FROM ruby:2.7.8-alpine3.16
 
 ARG BUILD_PACKAGES="build-base git"
 
diff --git a/features/hanami-app/Dockerfile b/features/hanami-app/Dockerfile
index e0b34761..31793393 100644
--- a/features/hanami-app/Dockerfile
+++ b/features/hanami-app/Dockerfile
@@ -1,4 +1,5 @@
-FROM ruby:2.5.9-alpine3.13
+
+FROM ruby:2.7.8-alpine3.16
 
 ARG BUILD_PACKAGES="build-base git sqlite-dev"
 
diff --git a/features/hanami-app/spec/features_helper.rb b/features/hanami-app/spec/features_helper.rb
index 53683330..598ece46 100644
--- a/features/hanami-app/spec/features_helper.rb
+++ b/features/hanami-app/spec/features_helper.rb
@@ -6,6 +6,6 @@
 
 Capybara.app = Hanami.app
 
-class MiniTest::Spec
+class Minitest::Spec
   include Capybara::DSL
 end
diff --git a/features/rails-app/Dockerfile b/features/rails-app/Dockerfile
index f4cdbd2b..297178f7 100644
--- a/features/rails-app/Dockerfile
+++ b/features/rails-app/Dockerfile
@@ -1,4 +1,5 @@
-FROM ruby:2.5.9-alpine3.13
+
+FROM ruby:2.7.8-alpine3.16
 
 ARG BUILD_PACKAGES="build-base git nodejs tzdata sqlite-dev"
 
diff --git a/features/rspec-rails/Dockerfile b/features/rspec-rails/Dockerfile
index f4cdbd2b..297178f7 100644
--- a/features/rspec-rails/Dockerfile
+++ b/features/rspec-rails/Dockerfile
@@ -1,4 +1,5 @@
-FROM ruby:2.5.9-alpine3.13
+
+FROM ruby:2.7.8-alpine3.16
 
 ARG BUILD_PACKAGES="build-base git nodejs tzdata sqlite-dev"
 
diff --git a/features/rspec-ruby/Dockerfile b/features/rspec-ruby/Dockerfile
index f52b6c3f..f6589036 100644
--- a/features/rspec-ruby/Dockerfile
+++ b/features/rspec-ruby/Dockerfile
@@ -1,4 +1,5 @@
-FROM ruby:2.5.9-alpine3.13
+
+FROM ruby:2.7.8-alpine3.16
 
 ARG BUILD_PACKAGES="build-base git"
 
diff --git a/features/ruby-app/Dockerfile b/features/ruby-app/Dockerfile
index f52b6c3f..f6589036 100644
--- a/features/ruby-app/Dockerfile
+++ b/features/ruby-app/Dockerfile
@@ -1,4 +1,5 @@
-FROM ruby:2.5.9-alpine3.13
+
+FROM ruby:2.7.8-alpine3.16
 
 ARG BUILD_PACKAGES="build-base git"
 
diff --git a/features/ruby-bare/Dockerfile b/features/ruby-bare/Dockerfile
index 0a6345a0..254f3cb4 100644
--- a/features/ruby-bare/Dockerfile
+++ b/features/ruby-bare/Dockerfile
@@ -1,4 +1,5 @@
-FROM ruby:2.5.9-alpine3.13
+
+FROM ruby:2.7.8-alpine3.16
 
 ARG BUILD_PACKAGES="build-base git"
 
diff --git a/features/ruby-bare/program_test.rb b/features/ruby-bare/program_test.rb
index 79a4a950..87a601e0 100644
--- a/features/ruby-bare/program_test.rb
+++ b/features/ruby-bare/program_test.rb
@@ -1,6 +1,6 @@
 require 'minitest/autorun'
 
-class SomeTest < MiniTest::Test
+class SomeTest < Minitest::Test
   def test_the_truth
     assert true
   end
diff --git a/retest.gemspec b/retest.gemspec
index acb70e90..7ac7f849 100644
--- a/retest.gemspec
+++ b/retest.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "A simple command line tool to watch file change and run its matching spec."
   spec.homepage      = "https://github.com/AlexB52/retest"
   spec.license       = "MIT"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -29,4 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "listen", ["~> 3.9"]
   spec.add_runtime_dependency "tty-option", ["~> 0.1"]
   spec.add_runtime_dependency "observer", ["~> 0.1"]
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'debug'
+
 end
diff --git a/test/fixtures/files/ruby/file_test.rb b/test/fixtures/files/ruby/file_test.rb
index cc317d57..b9a16aa7 100644
--- a/test/fixtures/files/ruby/file_test.rb
+++ b/test/fixtures/files/ruby/file_test.rb
@@ -1,6 +1,6 @@
 require 'minitest/autorun'
 
-class DummyFileTest < MiniTest::Test
+class DummyFileTest < Minitest::Test
   def test_assertion
     assert true
   end
diff --git a/test/retest/command/auto_flag.rb b/test/retest/command/auto_flag.rb
index ddd87c26..78df1807 100644
--- a/test/retest/command/auto_flag.rb
+++ b/test/retest/command/auto_flag.rb
@@ -1,5 +1,5 @@
 module Retest
-  class AutoFlagTest < MiniTest::Test
+  class AutoFlagTest < Minitest::Test
     SetupFake = Struct.new(:type)
 
     def setup
@@ -59,7 +59,7 @@ def test_for_unknown_setup
     end
   end
 
-  class AutoAllFlagTest < MiniTest::Test
+  class AutoAllFlagTest < Minitest::Test
     SetupFake = Struct.new(:type)
 
     def setup
diff --git a/test/retest/command/rails_test.rb b/test/retest/command/rails_test.rb
index 2811eef7..18781d5f 100644
--- a/test/retest/command/rails_test.rb
+++ b/test/retest/command/rails_test.rb
@@ -3,7 +3,7 @@
 
 module Retest
   class Command
-    class RailsTest < MiniTest::Test
+    class RailsTest < Minitest::Test
       def setup
         @subject = Rails.new(all: true, file_system: FakeFS.new([]))
       end
diff --git a/test/retest/command/rake_test.rb b/test/retest/command/rake_test.rb
index 436cf766..5c516a7c 100644
--- a/test/retest/command/rake_test.rb
+++ b/test/retest/command/rake_test.rb
@@ -3,7 +3,7 @@
 
 module Retest
   class Command
-    class RakeTest < MiniTest::Test
+    class RakeTest < Minitest::Test
       def setup
         @subject = Rake.new(all: true, file_system: FakeFS.new([]))
       end
diff --git a/test/retest/command/rspec_test.rb b/test/retest/command/rspec_test.rb
index 908a9a62..f8893a5f 100644
--- a/test/retest/command/rspec_test.rb
+++ b/test/retest/command/rspec_test.rb
@@ -3,7 +3,7 @@
 
 module Retest
   class Command
-    class RspecTest < MiniTest::Test
+    class RspecTest < Minitest::Test
       def setup
         @subject = Rspec.new(all: true, file_system: FakeFS.new([]))
       end
diff --git a/test/retest/command/ruby_test.rb b/test/retest/command/ruby_test.rb
index adc0eb14..d3d5add1 100644
--- a/test/retest/command/ruby_test.rb
+++ b/test/retest/command/ruby_test.rb
@@ -3,7 +3,7 @@
 
 module Retest
   class Command
-    class RubyTest < MiniTest::Test
+    class RubyTest < Minitest::Test
       def setup
         @subject = Ruby.new(all: true, file_system: FakeFS.new([]))
       end
diff --git a/test/retest/command_test.rb b/test/retest/command_test.rb
index f36aa028..de056819 100644
--- a/test/retest/command_test.rb
+++ b/test/retest/command_test.rb
@@ -2,7 +2,7 @@
 require_relative 'command/auto_flag'
 
 module Retest
-  class OptionsCommandTest < MiniTest::Test
+  class OptionsCommandTest < Minitest::Test
     def setup
       @subject = Command.new stdout: StringIO.new
     end
@@ -55,7 +55,7 @@ def test_mixed_options
     end
   end
 
-  class SetupCommandTest < MiniTest::Test
+  class SetupCommandTest < Minitest::Test
     FakeSetup = Struct.new(:type)
 
     def read_output
diff --git a/test/retest/file_system_test.rb b/test/retest/file_system_test.rb
index d4d75c08..5274bf00 100644
--- a/test/retest/file_system_test.rb
+++ b/test/retest/file_system_test.rb
@@ -7,7 +7,7 @@ def test_interface
 end
 
 module Retest
-  class FileSystemTest < MiniTest::Test
+  class FileSystemTest < Minitest::Test
     include FileSystemShared
 
     def setup
@@ -19,7 +19,7 @@ def test_exists?
     end
   end
 
-  class FakeFSTest < MiniTest::Test
+  class FakeFSTest < Minitest::Test
     include FileSystemShared
 
     def setup
diff --git a/test/retest/matching_options/path_test.rb b/test/retest/matching_options/path_test.rb
index 82ca8a05..9a5b4ba5 100644
--- a/test/retest/matching_options/path_test.rb
+++ b/test/retest/matching_options/path_test.rb
@@ -2,7 +2,7 @@
 
 module Retest
   class MatchingOptions
-    class PathTest < MiniTest::Test
+    class PathTest < Minitest::Test
       def setup
         @subject = Path.new('test/models/taxation/test_holdings.rb')
       end
diff --git a/test/retest/matching_options_test.rb b/test/retest/matching_options_test.rb
index f2e9b277..1b9916cb 100644
--- a/test/retest/matching_options_test.rb
+++ b/test/retest/matching_options_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Retest
-  class TestRootLevelFiles < MiniTest::Test
+  class TestRootLevelFiles < Minitest::Test
     def test_root_file_level
       files = %w(foo_spec.rb)
 
@@ -17,7 +17,7 @@ def test_root_file_level
     end
   end
 
-  class TestPrefixPatternTest < MiniTest::Test
+  class TestPrefixPatternTest < Minitest::Test
     def test_find_test
       files = %w(
         test/songs/99bottles.txt
@@ -66,7 +66,7 @@ def test_no_namespace_matching
     end
   end
 
-  class TestSuffixPatternTest < MiniTest::Test
+  class TestSuffixPatternTest < Minitest::Test
     def test_find_test
       files = %w(
         test/songs/99bottles.txt
@@ -121,7 +121,7 @@ def test_no_namespace_matching
     end
   end
 
-  class MultiplePatternTest < MiniTest::Test
+  class MultiplePatternTest < Minitest::Test
     def test_no_default_pattern_match
       files = %w(
         lib/active_record/fixtures.rb
diff --git a/test/retest/options_test.rb b/test/retest/options_test.rb
index c21315d0..82964f9e 100644
--- a/test/retest/options_test.rb
+++ b/test/retest/options_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Retest
-  class OptionsTest < MiniTest::Test
+  class OptionsTest < Minitest::Test
     def setup
       @subject = Options.new
     end
diff --git a/test/retest/program_test.rb b/test/retest/program_test.rb
index 2f0e3b93..063fe1b0 100644
--- a/test/retest/program_test.rb
+++ b/test/retest/program_test.rb
@@ -2,27 +2,25 @@
 
 # TODO : write missing tests
 module Retest
-  class ProgramTest < MiniTest::Test
-    class PauseTest < Minitest::Test
-      def setup
-        @subject = Program.new(repository: Repository.new, clear_window: false)
-      end
+  class PauseTest < Minitest::Test
+    def setup
+      @subject = Program.new(repository: Repository.new, clear_window: false)
+    end
 
-      def test_paused?
-        refute @subject.paused?
+    def test_paused?
+      refute @subject.paused?
 
-        @subject.pause
-        assert @subject.paused?
+      @subject.pause
+      assert @subject.paused?
 
-        @subject.resume
-        refute @subject.paused?
-      end
+      @subject.resume
+      refute @subject.paused?
+    end
 
-      def test_no_run_when_paused
-        @subject.runner = RaisingRunner.new
-        @subject.pause
-        @subject.run(['modified'], ['added'], ['removed'])
-      end
+    def test_no_run_when_paused
+      @subject.runner = RaisingRunner.new
+      @subject.pause
+      @subject.run(['modified'], ['added'], ['removed'])
     end
   end
 end
diff --git a/test/retest/prompt_test.rb b/test/retest/prompt_test.rb
index e1446473..1047128d 100644
--- a/test/retest/prompt_test.rb
+++ b/test/retest/prompt_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Retest
-  class PromptTest < MiniTest::Test
+  class PromptTest < Minitest::Test
     MethodCall = Struct.new(:name, :args, keyword_init: true)
     class FakeObserver
       attr_reader :notepad
diff --git a/test/retest/repository/multiple_test_files_with_user_input.rb b/test/retest/repository/multiple_test_files_with_user_input.rb
index fef4bb4d..bcd84d88 100644
--- a/test/retest/repository/multiple_test_files_with_user_input.rb
+++ b/test/retest/repository/multiple_test_files_with_user_input.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Retest
-  class MultipleTestFilesWithUserInputTest < MiniTest::Test
+  class MultipleTestFilesWithUserInputTest < Minitest::Test
     def setup
       files = %w(
         core/app/controllers/admin/billing_agent_customers_controller.rb
@@ -27,7 +27,7 @@ def test_find_test_user_input_question
 
         Which file do you want to use?
         Enter the file number now:
-        > 
+        >\s
       EXPECTED
     end
 
diff --git a/test/retest/repository_test.rb b/test/retest/repository_test.rb
index 81ffa2ab..84528ca7 100644
--- a/test/retest/repository_test.rb
+++ b/test/retest/repository_test.rb
@@ -2,7 +2,7 @@
 require_relative 'repository/multiple_test_files_with_user_input.rb'
 
 module Retest
-  class RepositoryTest < MiniTest::Test
+  class RepositoryTest < Minitest::Test
     def setup
       @subject = Repository.new
     end
@@ -143,7 +143,7 @@ def test_find_test_similar_files_but_no_exact_match
 
         Which file do you want to use?
         Enter the file number now:
-        > 
+        >\s
       EXPECTED
     end
 
@@ -181,7 +181,7 @@ def test_no_matches_with_no_match
       assert_equal({}, mock_cache)
     end
 
-    class TestFileChanged < MiniTest::Test
+    class TestFileChanged < Minitest::Test
       def setup
         @subject = Repository.new
       end
diff --git a/test/retest/runners/change_runner_test.rb b/test/retest/runners/change_runner_test.rb
index b6105ae2..8205c09f 100644
--- a/test/retest/runners/change_runner_test.rb
+++ b/test/retest/runners/change_runner_test.rb
@@ -4,7 +4,7 @@
 
 module Retest
   module Runners
-    class ChangeRunnerInterfaceTests < MiniTest::Test
+    class ChangeRunnerInterfaceTests < Minitest::Test
       def setup
         @subject = ChangeRunner.new("echo 'touch <changed>'")
       end
@@ -19,7 +19,7 @@ def observable_act(subject)
       end
     end
 
-    class ChangeRunnerTest < MiniTest::Test
+    class ChangeRunnerTest < Minitest::Test
       def setup
         @subject = ChangeRunner.new("echo 'touch <changed>'", stdout: StringIO.new)
       end
diff --git a/test/retest/runners/observable_runner.rb b/test/retest/runners/observable_runner.rb
index 1d356dc7..c3c21ad2 100644
--- a/test/retest/runners/observable_runner.rb
+++ b/test/retest/runners/observable_runner.rb
@@ -2,7 +2,7 @@ module Retest
   module Runners
     module OversableRunnerTests
       def test_publishes_event_after_running_command
-        observer = MiniTest::Mock.new
+        observer = Minitest::Mock.new
         observer.expect :update, true, [:tests_pass]
         observer.expect :hash, 1111
 
diff --git a/test/retest/runners/runner_test.rb b/test/retest/runners/runner_test.rb
index 64b36378..a8469117 100644
--- a/test/retest/runners/runner_test.rb
+++ b/test/retest/runners/runner_test.rb
@@ -4,7 +4,7 @@
 
 module Retest
   module Runners
-    class RunnerInterfaceTests < MiniTest::Test
+    class RunnerInterfaceTests < Minitest::Test
       def setup
         @subject = Runner.new("echo 'hello world'")
       end
@@ -19,7 +19,7 @@ def observable_act(subject)
       end
     end
 
-    class RunnerTest < MiniTest::Test
+    class RunnerTest < Minitest::Test
       def setup
         @subject = Runner.new("echo 'hello world'")
       end
diff --git a/test/retest/runners/test_runner_test.rb b/test/retest/runners/test_runner_test.rb
index e73341c6..02734cd9 100644
--- a/test/retest/runners/test_runner_test.rb
+++ b/test/retest/runners/test_runner_test.rb
@@ -4,7 +4,7 @@
 
 module Retest
   module Runners
-    class TestRunnerInterfaceTests < MiniTest::Test
+    class TestRunnerInterfaceTests < Minitest::Test
       def setup
         @repository = Repository.new(files: ['file_path_test.rb'])
         @subject    = TestRunner.new("echo 'touch <test>'")
@@ -23,7 +23,7 @@ def observable_act(subject)
       end
     end
 
-    class TestRunnerTest < MiniTest::Test
+    class TestRunnerTest < Minitest::Test
       def setup
         @repository = Repository.new(files: ['file_path_test.rb'])
         @subject    = TestRunner.new("echo 'touch <test>'", stdout: StringIO.new)
diff --git a/test/retest/runners/variable_runner_test.rb b/test/retest/runners/variable_runner_test.rb
index 01c2fcde..04190bc1 100644
--- a/test/retest/runners/variable_runner_test.rb
+++ b/test/retest/runners/variable_runner_test.rb
@@ -4,7 +4,7 @@
 
 module Retest
   module Runners
-    class VariableRunnerInterfaceTests < MiniTest::Test
+    class VariableRunnerInterfaceTests < Minitest::Test
       def setup
         @repository = Repository.new files: ['file_path_test.rb']
         @subject    = VariableRunner.new("echo 'touch <changed> & <test>'")
@@ -23,7 +23,7 @@ def observable_act(subject)
       end
     end
 
-    class VariableRunnerTest < MiniTest::Test
+    class VariableRunnerTest < Minitest::Test
       def setup
         @repository = Repository.new files: ['file_path_test.rb']
         @subject    = VariableRunner.new("echo 'touch <changed> & <test>'", stdout: StringIO.new)
diff --git a/test/retest/runners_test.rb b/test/retest/runners_test.rb
index 1e95c9f2..b99f9c6b 100644
--- a/test/retest/runners_test.rb
+++ b/test/retest/runners_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Retest
-  class RunnersTest < MiniTest::Test
+  class RunnersTest < Minitest::Test
     def test_runner_for
       assert_equal Runners::Runner.new('bundle exec rake test'), Runners.runner_for('bundle exec rake test')
       assert_equal Runners::TestRunner.new('echo <test>'), Runners.runner_for('echo <test>')
diff --git a/test/retest/setup_test.rb b/test/retest/setup_test.rb
index 582cbb91..b7db1e5a 100644
--- a/test/retest/setup_test.rb
+++ b/test/retest/setup_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Retest
-  class SetupTest < MiniTest::Test
+  class SetupTest < Minitest::Test
     def setup
       @subject = Setup.new
     end
diff --git a/test/retest/sounds/mac_os_test.rb b/test/retest/sounds/mac_os_test.rb
index a0b4179c..1ff6eee6 100644
--- a/test/retest/sounds/mac_os_test.rb
+++ b/test/retest/sounds/mac_os_test.rb
@@ -3,7 +3,7 @@
 
 module Retest
   module Sounds
-    class MacOSTests < MiniTest::Test
+    class MacOSTests < Minitest::Test
       include SoundsInterfaceTests
 
       def setup
@@ -17,7 +17,7 @@ def initialize(&block)
       end
 
       def test_play_tests_pass
-        kernel = MiniTest::Mock.new
+        kernel = Minitest::Mock.new
         kernel.expect(:system, true, ['afplay', '/System/Library/Sounds/Funk.aiff'])
 
         MacOS.new(kernel: kernel, thread: FakeThread).play(:tests_pass)
@@ -26,7 +26,7 @@ def test_play_tests_pass
       end
 
       def test_play_tests_fail
-        kernel = MiniTest::Mock.new
+        kernel = Minitest::Mock.new
         kernel.expect(:system, true, ['afplay', '/System/Library/Sounds/Sosumi.aiff'])
 
         MacOS.new(kernel: kernel, thread: FakeThread).play(:tests_fail)
@@ -35,7 +35,7 @@ def test_play_tests_fail
       end
 
       def test_play_question
-        kernel = MiniTest::Mock.new
+        kernel = Minitest::Mock.new
         kernel.expect(:system, true, ['afplay', '/System/Library/Sounds/Glass.aiff'])
 
         MacOS.new(kernel: kernel, thread: FakeThread).play(:question)
@@ -44,7 +44,7 @@ def test_play_question
       end
 
       def test_play_start
-        kernel = MiniTest::Mock.new
+        kernel = Minitest::Mock.new
         kernel.expect(:system, true, ['afplay', '/System/Library/Sounds/Blow.aiff'])
 
         MacOS.new(kernel: kernel, thread: FakeThread).play(:start)
diff --git a/test/retest/sounds/mute_test.rb b/test/retest/sounds/mute_test.rb
index ee2540f1..0c33286e 100644
--- a/test/retest/sounds/mute_test.rb
+++ b/test/retest/sounds/mute_test.rb
@@ -3,7 +3,7 @@
 
 module Retest
   module Sounds
-    class MuteTests < MiniTest::Test
+    class MuteTests < Minitest::Test
       include SoundsInterfaceTests
 
       def setup
diff --git a/test/retest/sounds_test.rb b/test/retest/sounds_test.rb
index 34b8b1fc..6e1b91df 100644
--- a/test/retest/sounds_test.rb
+++ b/test/retest/sounds_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Retest
-  class SoundsTest < MiniTest::Test
+  class SoundsTest < Minitest::Test
     def test_sounds_for
       assert_instance_of Sounds::MacOS, Sounds.for(Options.new(['--notify']))
       assert_instance_of Sounds::Mute,  Sounds.for(Options.new([]))
diff --git a/test/retest_test.rb b/test/retest_test.rb
index 9deef2bd..1f0d9ce8 100644
--- a/test/retest_test.rb
+++ b/test/retest_test.rb
@@ -8,14 +8,14 @@ def test_that_it_has_a_version_number
   end
 end
 
-class ListenTests < MiniTest::Test
+class ListenTests < Minitest::Test
   include Retest
 
   def test_listen_default_behaviour
-    listener = MiniTest::Mock.new
-    expected_options = {relative: true, only: Regexp.new('\\.rb$'), force_polling: false}
+    listener = Minitest::Mock.new
+    expected_options = { relative: true, only: Regexp.new('\\.rb$'), force_polling: false }
 
-    listener.expect(:to, Struct.new(:start).new, ['.', expected_options])
+    listener.expect(:to, Struct.new(:start).new, ['.'], **expected_options)
 
     Retest.listen(Options.new, listener: listener)
 
@@ -23,10 +23,10 @@ def test_listen_default_behaviour
   end
 
   def test_listen_when_polling
-    listener = MiniTest::Mock.new
-    expected_options = {relative: true, only: Regexp.new('\\.rb$'), force_polling: true}
+    listener = Minitest::Mock.new
+    expected_options = { relative: true, only: Regexp.new('\\.rb$'), force_polling: true }
 
-    listener.expect(:to, Struct.new(:start).new, ['.', expected_options])
+    listener.expect(:to, Struct.new(:start).new, ['.'], **expected_options)
 
     Retest.listen(Options.new(["--polling"]), listener: listener)
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index a2dbc900..6ac54c80 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
 require "retest"
-require "byebug"
+require "debug"
 require "minitest/autorun"
 
 WAITING_TIME = 0.0001