1 files changed, 10 insertions, 1 deletions
diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb
index 34ab745eb0..f4e93fa1b6 100644
--- a/test/readline/test_readline_history.rb
+++ b/test/readline/test_readline_history.rb
@@ -260,6 +260,7 @@ class TestReadlineHistory < Test::Unit::TestCase
     super
   end
 end if defined?(::ReadlineSo) && defined?(::ReadlineSo::HISTORY) &&
+  ENV["TEST_READLINE_OR_RELINE"] != "Reline" &&
   (
    begin
      ReadlineSo::HISTORY.clear
@@ -275,4 +276,12 @@ class TestRelineAsReadlineHistory < Test::Unit::TestCase
     use_lib_reline
     super
   end
-end
+
+  def get_default_internal_encoding
+    if RUBY_PLATFORM =~ /mswin|mingw/
+      Encoding.default_internal || Encoding::UTF_8
+    else
+      super
+    end
+  end
+end if defined?(Reline) && ENV["TEST_READLINE_OR_RELINE"] != "Readline"