diff --git a/.travis.yml b/.travis.yml
index b2ea18fc..57878f6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.1
-  - 2.1.2
-  - jruby-18mode
-  - jruby-19mode
+  - 2.1.10
+  - 2.3.4
+  - 2.4.3
+  - 2.5.0
+  - jruby-9.1.15.0
 before_install:
   - gem install bundler
   - bundle --version
diff --git a/tests/units/test_archive.rb b/tests/units/test_archive.rb
index 2ff55314..10ce817a 100644
--- a/tests/units/test_archive.rb
+++ b/tests/units/test_archive.rb
@@ -25,11 +25,11 @@ def test_archive
 
     f = @git.object('v2.6').archive(nil, :format => 'tar') # returns path to temp file
     assert(File.exist?(f))
-    
-    lines = `cd /tmp; tar xvpf #{f}`.split("\n")
-    assert_equal('ex_dir/', lines[0])
-    assert_equal('example.txt', lines[2])
-    
+
+    lines = `cd /tmp; tar xvpf #{f} 2>&1`.split("\n")
+    assert_match(%r{ex_dir/}, lines[0])
+    assert_match(/example.txt/, lines[2])
+
     f = @git.object('v2.6').archive(tempfile, :format => 'zip')
     assert(File.file?(f))
 
@@ -38,10 +38,10 @@ def test_archive
 
     f = @git.object('v2.6').archive(tempfile, :format => 'tar', :prefix => 'test/', :path => 'ex_dir/')
     assert(File.exist?(f))
-    
-    lines = `cd /tmp; tar xvpf #{f}`.split("\n")
-    assert_equal('test/', lines[0])
-    assert_equal('test/ex_dir/ex.txt', lines[2])
+
+    lines = `cd /tmp; tar xvpf #{f} 2>&1`.split("\n")
+    assert_match(%r{test/}, lines[0])
+    assert_match(%r{test/ex_dir/ex\.txt}, lines[2])
 
     in_temp_dir do
       c = Git.clone(@wbare, 'new')
diff --git a/tests/units/test_bare.rb b/tests/units/test_bare.rb
index dcd86db6..33510317 100644
--- a/tests/units/test_bare.rb
+++ b/tests/units/test_bare.rb
@@ -26,9 +26,9 @@ def test_commit
     assert_equal('test', o.message)
 
     assert_equal('tags/v2.5', o.parent.name)
-    assert_equal('master', o.parent.parent.name)
-    assert_equal('master~1', o.parent.parent.parent.name)
-    
+    assert_equal('tags/v2.5~1', o.parent.parent.name)
+    assert_equal('tags/v2.5~2', o.parent.parent.parent.name)
+
     o = @git.object('HEAD')
     assert(o.is_a?(Git::Object::Commit))
     assert(o.commit?)