diff --git a/bundler.d/test.rb b/bundler.d/test.rb
index c91491c38d51..526ad8b9f412 100644
--- a/bundler.d/test.rb
+++ b/bundler.d/test.rb
@@ -15,5 +15,4 @@
   gem "poltergeist"
   gem 'test-unit' if RUBY_VERSION >= '2.2'
   gem 'test_after_commit', '~> 0.4'
-  gem 'fakefs', :require => 'fakefs/safe'
 end
diff --git a/test/unit/auth_sources/auth_source_ldap_test.rb b/test/unit/auth_sources/auth_source_ldap_test.rb
index 2e4998e1141f..8aa716415842 100644
--- a/test/unit/auth_sources/auth_source_ldap_test.rb
+++ b/test/unit/auth_sources/auth_source_ldap_test.rb
@@ -283,15 +283,6 @@ def setup
   end
 
   context 'save external avatar' do
-    def setup
-      require 'fakefs/safe'
-      FakeFS.activate!
-    end
-
-    def teardown
-      FakeFS.deactivate!
-    end
-
     test 'store_avatar can save 8bit ascii files' do
       auth = AuthSourceLdap.new
       FileUtils.mkdir_p(File.join(Rails.root, 'tmp'))
@@ -304,6 +295,9 @@ def teardown
         auth.send(:store_avatar, file_string)
       end
       assert(File.exist?("#{Rails.public_path}/assets/avatars/#{avatar_hash}.jpg"))
+
+      File.delete("#{Rails.root}/tmp/out.txt")
+      File.delete("#{Rails.public_path}/assets/avatars/#{avatar_hash}.jpg")
     end
   end