diff --git a/features/project/builds/badge.feature b/features/project/badges/build.feature
similarity index 96%
rename from features/project/builds/badge.feature
rename to features/project/badges/build.feature
index 9eb34475e68..bdd934651e6 100644
--- a/features/project/builds/badge.feature
+++ b/features/project/badges/build.feature
@@ -1,4 +1,4 @@
-Feature: Project Builds Badge
+Feature: Project Badges Build
   Background:
     Given I sign in as a user
     And I own a project
diff --git a/features/steps/project/builds/badge.rb b/features/steps/project/badges/build.rb
similarity index 85%
rename from features/steps/project/builds/badge.rb
rename to features/steps/project/badges/build.rb
index 52ef3b4484e..10b27d61fdd 100644
--- a/features/steps/project/builds/badge.rb
+++ b/features/steps/project/badges/build.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectBuildsBadge < Spinach::FeatureSteps
+class Spinach::Features::ProjectBadgesBuild < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedBuilds
@@ -20,11 +20,8 @@ class Spinach::Features::ProjectBuildsBadge < Spinach::FeatureSteps
     expect_badge('running')
   end
 
-  def svg
-    Nokogiri::HTML.parse(page.body)
-  end
-
   def expect_badge(status)
+    svg = Nokogiri::HTML.parse(page.body)
     expect(page.response_headers).to include('Content-Type' => 'image/svg+xml')
     expect(svg.at(%Q{text:contains("#{status}")})).to be_truthy
   end