diff --git a/.travis.yml b/.travis.yml
index aca31bb1..3987ccc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1
   - jruby-18mode
   - jruby-19mode
   - jruby-head
diff --git a/lib/git/base.rb b/lib/git/base.rb
index bcec10e6..362f6432 100644
--- a/lib/git/base.rb
+++ b/lib/git/base.rb
@@ -446,13 +446,13 @@ def gc
     end
     
     def apply(file)
-      if File.exists?(file)
+      if File.exist?(file)
         self.lib.apply(file)
       end
     end
     
     def apply_mail(file)
-      self.lib.apply_mail(file) if File.exists?(file)
+      self.lib.apply_mail(file) if File.exist?(file)
     end
     
     ## LOWER LEVEL INDEX OPERATIONS ##
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
index ec5e07c1..75b9b905 100644
--- a/lib/git/lib.rb
+++ b/lib/git/lib.rb
@@ -632,7 +632,7 @@ def pull(remote='origin', branch='master')
 
     def tag_sha(tag_name)
       head = File.join(@git_dir, 'refs', 'tags', tag_name)
-      return File.read(head).chomp if File.exists?(head)
+      return File.read(head).chomp if File.exist?(head)
       
       command('show-ref',  ['--tags', '-s', tag_name])
     end  
diff --git a/lib/git/path.rb b/lib/git/path.rb
index ecb5b9e6..4b20d9a7 100644
--- a/lib/git/path.rb
+++ b/lib/git/path.rb
@@ -7,7 +7,7 @@ class Path
     def initialize(path, check_path=true)
       path = File.expand_path(path)
       
-      if check_path && !File.exists?(path)
+      if check_path && !File.exist?(path)
         raise ArgumentError, 'path does not exist', [path]
       end
       
diff --git a/tests/units/test_archive.rb b/tests/units/test_archive.rb
index efff94a3..21e06150 100644
--- a/tests/units/test_archive.rb
+++ b/tests/units/test_archive.rb
@@ -15,16 +15,16 @@ def tempfile
   
   def test_archive
     f = @git.archive('v2.6', tempfile)
-    assert(File.exists?(f))
+    assert(File.exist?(f))
 
     f = @git.object('v2.6').archive(tempfile)  # writes to given file
-    assert(File.exists?(f))
+    assert(File.exist?(f))
 
     f = @git.object('v2.6').archive # returns path to temp file
-    assert(File.exists?(f))
+    assert(File.exist?(f))
     
     f = @git.object('v2.6').archive(nil, :format => 'tar') # returns path to temp file
-    assert(File.exists?(f))
+    assert(File.exist?(f))
     
     lines = `cd /tmp; tar xvpf #{f}`.split("\n")
     assert_equal('ex_dir/', lines[0])
@@ -34,10 +34,10 @@ def test_archive
     assert(File.file?(f))
 
     f = @git.object('v2.6').archive(tempfile, :format => 'tgz', :prefix => 'test/')
-    assert(File.exists?(f))
+    assert(File.exist?(f))
     
     f = @git.object('v2.6').archive(tempfile, :format => 'tar', :prefix => 'test/', :path => 'ex_dir/')
-    assert(File.exists?(f))
+    assert(File.exist?(f))
     
     lines = `cd /tmp; tar xvpf #{f}`.split("\n")
     assert_equal('test/', lines[0])
@@ -47,7 +47,7 @@ def test_archive
       c = Git.clone(@wbare, 'new')
       c.chdir do
         f = @git.remote('origin').branch('master').archive(tempfile, :format => 'tgz')
-        assert(File.exists?(f))
+        assert(File.exist?(f))
       end
     end
   end
diff --git a/tests/units/test_index_ops.rb b/tests/units/test_index_ops.rb
index adaa5909..89aeb459 100644
--- a/tests/units/test_index_ops.rb
+++ b/tests/units/test_index_ops.rb
@@ -56,26 +56,26 @@ def test_clean
           new_file('clean-me-too', 'blablahbla')
         end
 
-        assert(File.exists?('file-to-clean'))
-        assert(File.exists?('dir_to_clean'))
-        assert(File.exists?('ignored_file'))
+        assert(File.exist?('file-to-clean'))
+        assert(File.exist?('dir_to_clean'))
+        assert(File.exist?('ignored_file'))
 
         g.clean(:force => true)
         
-        assert(!File.exists?('file-to-clean'))
-        assert(File.exists?('dir_to_clean'))
-        assert(File.exists?('ignored_file'))
+        assert(!File.exist?('file-to-clean'))
+        assert(File.exist?('dir_to_clean'))
+        assert(File.exist?('ignored_file'))
 
         new_file('file-to-clean', 'blablahbla')
         
         g.clean(:force => true, :d => true)
 
-        assert(!File.exists?('file-to-clean'))
-        assert(!File.exists?('dir_to_clean'))
-        assert(File.exists?('ignored_file'))
+        assert(!File.exist?('file-to-clean'))
+        assert(!File.exist?('dir_to_clean'))
+        assert(File.exist?('ignored_file'))
 
         g.clean(:force => true, :x => true)
-        assert(!File.exists?('ignored_file'))
+        assert(!File.exist?('ignored_file'))
       end
     end
   end
@@ -97,7 +97,7 @@ def test_revert
         commits = g.log(1e4).count
         g.revert(first_commit.sha)
         assert_equal(commits + 1, g.log(1e4).count)
-        assert(!File.exists?('test-file2'))
+        assert(!File.exist?('test-file2'))
       end
     end
   end
diff --git a/tests/units/test_init.rb b/tests/units/test_init.rb
index 86c5e301..d735791d 100644
--- a/tests/units/test_init.rb
+++ b/tests/units/test_init.rb
@@ -34,7 +34,7 @@ def test_git_init
     in_temp_dir do |path|
       repo = Git.init(path)
       assert(File.directory?(File.join(path, '.git')))
-      assert(File.exists?(File.join(path, '.git', 'config')))
+      assert(File.exist?(File.join(path, '.git', 'config')))
       assert_equal('false', repo.config('core.bare'))
     end
   end
@@ -43,18 +43,18 @@ def test_git_init_bare
     in_temp_dir do |path|
       repo = Git.init(path, :bare => true)
       assert(File.directory?(File.join(path, '.git')))
-      assert(File.exists?(File.join(path, '.git', 'config')))
+      assert(File.exist?(File.join(path, '.git', 'config')))
       assert_equal('true', repo.config('core.bare'))
     end
   end
   
   def test_git_init_remote_git
     in_temp_dir do |dir|
-      assert(!File.exists?(File.join(dir, 'config')))
+      assert(!File.exist?(File.join(dir, 'config')))
       
       in_temp_dir do |path|        
         Git.init(path, :repository => dir)
-        assert(File.exists?(File.join(dir, 'config')))
+        assert(File.exist?(File.join(dir, 'config')))
       end
     end
   end
@@ -62,7 +62,7 @@ def test_git_init_remote_git
   def test_git_clone
     in_temp_dir do |path|      
       g = Git.clone(@wbare, 'bare-co')
-      assert(File.exists?(File.join(g.repo.path, 'config')))
+      assert(File.exist?(File.join(g.repo.path, 'config')))
       assert(g.dir)
     end
   end
@@ -70,7 +70,7 @@ def test_git_clone
   def test_git_clone_bare
     in_temp_dir do |path|      
       g = Git.clone(@wbare, 'bare.git', :bare => true)
-      assert(File.exists?(File.join(g.repo.path, 'config')))
+      assert(File.exist?(File.join(g.repo.path, 'config')))
       assert_nil(g.dir)
     end
   end
@@ -79,7 +79,7 @@ def test_git_clone_config
     in_temp_dir do |path|     
       g = Git.clone(@wbare, 'config.git', :config => "receive.denyCurrentBranch=ignore")
       assert_equal('ignore', g.config['receive.denycurrentbranch'])
-      assert(File.exists?(File.join(g.repo.path, 'config')))
+      assert(File.exist?(File.join(g.repo.path, 'config')))
       assert(g.dir)
     end
   end