diff --git a/features/support/jruby.rb b/features/support/jruby.rb
deleted file mode 100644
index b29a0e586..000000000
--- a/features/support/jruby.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-if RUBY_PLATFORM == 'java'
-  Before do
-    @aruba_timeout_seconds = 15
-  end
-end
diff --git a/lib/aruba/api/deprecated.rb b/lib/aruba/api/deprecated.rb
index 3da9e1c49..04a469479 100644
--- a/lib/aruba/api/deprecated.rb
+++ b/lib/aruba/api/deprecated.rb
@@ -774,8 +774,7 @@ def assert_exact_output(expected, actual)
       def assert_partial_output(expected, actual)
         Aruba.platform.deprecated(
           'The use of "#assert_partial_output" is deprecated.' \
-          ' Use "expect(command).to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(actual).to include_output_string partial" instead.'
         )
 
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
@@ -792,8 +791,7 @@ def assert_partial_output(expected, actual)
       def assert_matching_output(expected, actual)
         Aruba.platform.deprecated(
           'The use of "#assert_matching_output" is deprecated.' \
-          ' Use "expect(command).to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(actual).to match_output partial" instead.'
         )
 
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
@@ -810,8 +808,7 @@ def assert_matching_output(expected, actual)
       def assert_not_matching_output(expected, actual)
         Aruba.platform.deprecated(
           'The use of "#assert_not_matching_output" is deprecated.' \
-          ' Use "expect(command).not_to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(actual).not_to match_output partial" instead.'
         )
 
         actual.force_encoding(expected.encoding) if RUBY_VERSION >= "1.9"
@@ -828,8 +825,7 @@ def assert_not_matching_output(expected, actual)
       def assert_no_partial_output(unexpected, actual)
         Aruba.platform.deprecated(
           'The use of "#assert_no_partial_output" is deprecated.' \
-          ' Use "expect(command).not_to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(actual).not_to include_output_string partial" instead.'
         )
 
         actual.force_encoding(unexpected.encoding) if RUBY_VERSION >= "1.9"
@@ -851,8 +847,7 @@ def assert_no_partial_output(unexpected, actual)
       def assert_partial_output_interactive(expected)
         Aruba.platform.deprecated(
           'The use of "#assert_partial_output_interactive" is deprecated.' \
-          ' Use "expect(last_command_started).to have_output /partial/" instead.' \
-          ' There are also special matchers for "stdout" and "stderr"'
+          ' Use "expect(last_command_started).to have_output an_output_string_including partial" instead.'
         )
 
         Aruba.platform.unescape(last_command_started.stdout, aruba.config.keep_ansi).
@@ -1003,9 +998,6 @@ def stderr_from(cmd)
       # @deprecated
       #
       # Default exit timeout for running commands with aruba
-      #
-      # Overwrite this method if you want a different timeout or set
-      # `@aruba_timeout_seconds`.
       def exit_timeout
         Aruba.platform.deprecated(
           'The use of "#exit_timeout" is deprecated.' \