diff --git a/spec/features/projects/artifacts_spec.rb b/spec/features/projects/artifacts_spec.rb
index fc6e2b07d408e5ec3d11b51aa951e88f04a58a5d..5e60c2f3074c6ee4ca168d58ddf35843c5e3cb82 100644
--- a/spec/features/projects/artifacts_spec.rb
+++ b/spec/features/projects/artifacts_spec.rb
@@ -2,27 +2,33 @@ require 'spec_helper'
 
 describe 'Artifacts' do
   let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
+  let(:pipeline) { create(:ci_pipeline) }
+  let(:build) { create(:ci_build, pipeline: pipeline) }
+  let(:build2) { create(:ci_build) }
+  let(:project) { pipeline.project }
 
   before do
     login_as(:user)
-    @commit = FactoryGirl.create :ci_pipeline
-    @build = FactoryGirl.create :ci_build, pipeline: @commit
-    @build2 = FactoryGirl.create :ci_build
-    @project = @commit.project
-    @project.team << [@user, :developer]
+    project.team << [@user, :developer]
   end
 
-  describe "GET /:project/builds/:id/artifacts/download" do
+  describe 'GET /:project/builds/:id/artifacts/download' do
     before do
-      @build.update_attributes(artifacts_file: artifacts_file)
-      visit namespace_project_build_path(@project.namespace, @project, @build)
+      build.update_attributes(artifacts_file: artifacts_file)
+
+      visit namespace_project_build_path(project.namespace, project, build)
+
       click_link 'Download'
     end
 
-    context "Build from other project" do
+    context 'Build from other project' do
       before do
-        @build2.update_attributes(artifacts_file: artifacts_file)
-        visit download_namespace_project_build_artifacts_path(@project.namespace, @project, @build2)
+        build2.update_attributes(artifacts_file: artifacts_file)
+
+        visit download_namespace_project_build_artifacts_path(
+                project.namespace,
+                project,
+                build2)
       end
 
       it { expect(page.status_code).to eq(404) }