diff --git a/spec/support/setup_builds_storage.rb b/spec/support/setup_builds_storage.rb
index fd729434898f95e5fbdc1c162b8a60e376de7dbf..2e7c88bfc09062650277fb9e19d18c625e3bdd4b 100644
--- a/spec/support/setup_builds_storage.rb
+++ b/spec/support/setup_builds_storage.rb
@@ -7,11 +7,12 @@ RSpec.configure do |config|
     Settings.gitlab_ci['builds_path'] = builds_path
   end
 
-  config.before(:each) do
+  config.before(:all) do
     FileUtils.mkdir_p(builds_path)
   end
 
-  config.after(:each) do
+  config.before(:each) do
     FileUtils.rm_rf(builds_path)
+    FileUtils.mkdir_p(builds_path)
   end
 end