diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb
index b2004b99961..f3aaff9140d 100644
--- a/app/helpers/builds_helper.rb
+++ b/app/helpers/builds_helper.rb
@@ -3,5 +3,6 @@ module BuildsHelper
     build_class = ''
     build_class += ' active' if build == current_build
     build_class += ' retried' if build.retried?
+    build_class
   end
 end
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 583fd958849..bf157e4f64a 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -6,7 +6,7 @@
 - coverage = local_assigns.fetch(:coverage, false)
 - allow_retry = local_assigns.fetch(:allow_retry, false)
 
-%tr.build.commit{class: ('retried' if defined?(retried) && retried)}
+%tr.build.commit{class: ('retried' if retried)}
   %td.status
     - if can?(current_user, :read_build, build)
       = ci_status_with_icon(build.status, namespace_project_build_url(build.project.namespace, build.project, build))
@@ -36,7 +36,7 @@
     - if build.stuck?
       = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
 
-    - if defined?(retried) && retried
+    - if retried
       = icon('refresh', class: 'text-warning has-tooltip', title: 'Build was retried')
 
     .label-container
diff --git a/spec/features/projects/pipelines_spec.rb b/spec/features/projects/pipelines_spec.rb
index 47482bc3cc9..db56a50e058 100644
--- a/spec/features/projects/pipelines_spec.rb
+++ b/spec/features/projects/pipelines_spec.rb
@@ -177,7 +177,7 @@ describe "Pipelines" do
         before { click_on 'Retry failed' }
 
         it { expect(page).not_to have_content('Retry failed') }
-        it { expect(page).to have_content('retried') }
+        it { expect(page).to have_selector('.retried') }
       end
     end