diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index d1844bd2b878e1003c538f49e5bd2873131f7745..6d4a806791012e9b6ab7a404d98c583e82095980 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -35,6 +35,7 @@ module TestEnv
 
     # Create repository for FactoryGirl.create(:project)
     setup_factory_repo
+
     # Create repository for FactoryGirl.create(:forked_project_with_submodules)
     setup_forked_repo
   end
@@ -54,7 +55,7 @@ module TestEnv
     tmp_test_path = Rails.root.join('tmp', 'tests', '**')
 
     Dir[tmp_test_path].each do |entry|
-      unless File.basename(entry) =~ /\Agitlab-(shell|test)\z/
+      unless File.basename(entry) =~ /\Agitlab-(shell|test|test-fork)\z/
         FileUtils.rm_rf(entry)
       end
     end