diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index aac78d75f57825d6193fc8292abe5c3962033490..e5523c42a3be1b3e07a76b233182d258e93c348d 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -460,7 +460,7 @@ module Ci
 
     def build_attributes_from_config
       return {} unless pipeline.config_processor
-      
+
       pipeline.config_processor.build_attributes(name)
     end
   end
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index dc88697199b3eb405d2600e107715835369dead8..47c489e6af185e3a100b14cdc394948a29934420 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -275,7 +275,8 @@ describe Ci::Build, models: true do
 
     context 'when yaml_variables are undefined' do
       before do
-        build.yaml_variables = nil
+        build.update(yaml_variables: nil)
+        build.reload # reload pipeline so that it resets config_processor
       end
 
       context 'use from gitlab-ci.yml' do
@@ -854,7 +855,8 @@ describe Ci::Build, models: true do
 
     context 'if is undefined' do
       before do
-        build.when = nil
+        build.update(when: nil)
+        build.reload # reload pipeline so that it resets config_processor
       end
 
       context 'use from gitlab-ci.yml' do