diff --git a/CHANGELOG b/CHANGELOG
index 8d1f8d59b3c..a9102ea4206 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.5.0 (unreleased)
   - Fix diff comments loaded by AJAX to load comment with diff in discussion tab
   - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
   - Don't vendor minified JS
+  - Display 404 error on group not found
 
 v 8.4.1
   - Apply security updates for Rails (4.2.5.1), rails-html-sanitizer (1.0.3),
diff --git a/features/explore/groups.feature b/features/explore/groups.feature
index 7529dcc3d9d..5fc9b135601 100644
--- a/features/explore/groups.feature
+++ b/features/explore/groups.feature
@@ -3,11 +3,6 @@ Feature: Explore Groups
   Background:
     Given group "TestGroup" has private project "Enterprise"
 
-  Scenario: I should not see a group if it does not exist
-    When I sign in as a user
-    And I visit group "NonExistentGroup" page
-    Then page status code should be 404
-
   Scenario: I should see group with private and internal projects as user
     Given group "TestGroup" has internal project "Internal"
     When I sign in as a user
diff --git a/features/groups.feature b/features/groups.feature
index c803e952980..55fffb012ae 100644
--- a/features/groups.feature
+++ b/features/groups.feature
@@ -3,6 +3,10 @@ Feature: Groups
     Given I sign in as "John Doe"
     And "John Doe" is owner of group "Owned"
 
+  Scenario: I should not see a group if it does not exist
+    When I visit group "NonExistentGroup" page
+    Then page status code should be 404
+
   Scenario: I should have back to group button
     When I visit group "Owned" page
     Then I should see back to dashboard button
diff --git a/features/steps/explore/groups.rb b/features/steps/explore/groups.rb
index 68c473e7b29..87f32e70d59 100644
--- a/features/steps/explore/groups.rb
+++ b/features/steps/explore/groups.rb
@@ -26,10 +26,6 @@ class Spinach::Features::ExploreGroups < Spinach::FeatureSteps
     visit group_path(Group.find_by(name: "TestGroup"))
   end
 
-  step 'I visit group "NonExistentGroup" page' do
-    visit group_path(-1)
-  end
-
   step 'I visit group "TestGroup" issues page' do
     visit issues_group_path(Group.find_by(name: "TestGroup"))
   end
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index 4c5122d1b7d..1e2a78a6029 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -120,6 +120,10 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
     expect(page).to have_xpath("//span[@class='label label-warning']", text: 'archived')
   end
 
+  step 'I visit group "NonExistentGroup" page' do
+    visit group_path(-1)
+  end
+
   private
 
   def assigned_to_me(key)