diff --git a/lib/aruba/config/jruby.rb b/lib/aruba/config/jruby.rb
index 99244729d..01481cc7e 100644
--- a/lib/aruba/config/jruby.rb
+++ b/lib/aruba/config/jruby.rb
@@ -17,7 +17,7 @@
 
     env["JRUBY_OPTS"] = jruby_opts
 
-    if /solaris|sunos/i.match(RbConfig::CONFIG["host_os"])
+    if /solaris|sunos/i =~ RbConfig::CONFIG["host_os"]
       java_opts = env["JAVA_OPTS"] || ""
 
       # force jRuby to use client JVM for faster startup times
diff --git a/lib/aruba/initializer.rb b/lib/aruba/initializer.rb
index 6af2a5230..47246dfa8 100644
--- a/lib/aruba/initializer.rb
+++ b/lib/aruba/initializer.rb
@@ -24,7 +24,7 @@ def add_gem
 
         content = if File.exist? file
                     file_ends_with_carriage_return =
-                      File.open(file, "r").readlines.last.match(/.*\n$/)
+                      File.open(file, "r").readlines.last =~ /.*\n$/
 
                     prefix = file_ends_with_carriage_return ? "" : "\n"
 
diff --git a/lib/aruba/matchers/base/message_indenter.rb b/lib/aruba/matchers/base/message_indenter.rb
index afc806a4f..4cdcf150f 100644
--- a/lib/aruba/matchers/base/message_indenter.rb
+++ b/lib/aruba/matchers/base/message_indenter.rb
@@ -10,7 +10,7 @@ module MessageIndenter
         def indent_multiline_message(message)
           message = message.sub(/\n+\z/, "")
           message.lines.map do |line|
-            /\S/.match(line) ? "   #{line}" : line
+            /\S/ =~ line ? "   #{line}" : line
           end.join
         end
       end
diff --git a/lib/aruba/platforms/unix_platform.rb b/lib/aruba/platforms/unix_platform.rb
index ad0232047..261ad2745 100644
--- a/lib/aruba/platforms/unix_platform.rb
+++ b/lib/aruba/platforms/unix_platform.rb
@@ -83,7 +83,7 @@ def default_shell
       end
 
       def detect_ruby(cmd)
-        if /^ruby\s/.match(cmd)
+        if /^ruby\s/ =~ cmd
           cmd.gsub(/^ruby\s/, "#{current_ruby} ")
         else
           cmd
diff --git a/lib/aruba/platforms/windows_command_string.rb b/lib/aruba/platforms/windows_command_string.rb
index ad1250355..08dc05929 100644
--- a/lib/aruba/platforms/windows_command_string.rb
+++ b/lib/aruba/platforms/windows_command_string.rb
@@ -22,7 +22,7 @@ def to_a
 
       def escaped_arguments
         @arguments.map { |arg| arg.gsub(/"/, '"""') }
-                  .map { |arg| / /.match(arg) ? "\"#{arg}\"" : arg }
+                  .map { |arg| / / =~ arg ? "\"#{arg}\"" : arg }
       end
 
       def escaped_command