diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index d428e63aef9ecc653c00a2a97b53404b1d6c8e6f..cbb935abd53c1f4e172291d01a2c545717d4c3fa 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -396,8 +396,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
       end
 
       context 'job is successful and has deployment' do
-        let(:build) { create(:ci_build, :success, :trace_live, environment: environment.name, pipeline: pipeline) }
-        let!(:deployment) { create(:deployment, :success, environment: environment, project: environment.project, deployable: build) }
+        let(:build) { create(:ci_build, :success, :trace_live, environment: environment.name, pipeline: pipeline, deployment: deployment) }
+        let(:deployment) { create(:deployment, :success, environment: environment, project: environment.project) }
 
         it 'shows a link for the job' do
           expect(page).to have_link environment.name
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 5fa3059e55f21a7e293011618e86b7c7d014c66d..64f904b66b12eab3c9a0e7ed91c57c0eafefd9f5 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -3307,12 +3307,5 @@ describe Ci::Build do
 
       it { expect(build.deployment_status).to eq(:creating) }
     end
-
-    context 'when build is successful but deployment is not ready yet' do
-      let(:build) { create(:ci_build, :success, environment: 'production') }
-      let(:environment) { create(:environment, name: 'production', project: build.project) }
-
-      it { expect(build.deployment_status).to eq(:creating) }
-    end
   end
 end