diff --git a/Gemfile b/Gemfile
index 14ea7ec7ea099a3b6bcb44785fec3bd39244fc9f..cd463fbd82f1a0e437fc64f650ffd046b4e2270e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,7 +68,7 @@ gem 'github-linguist', '~> 4.7.0', require: 'linguist'
 
 # API
 gem 'grape',        '~> 0.15.0'
-gem 'grape-entity', '~> 0.5.2'
+gem 'grape-entity', '~> 0.6.0'
 gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
 
 # Pagination
diff --git a/Gemfile.lock b/Gemfile.lock
index 331ffd8914800299781e4e1322437a3cb3862730..cf2ebaa00d6a6b446330a77b3a8290125524ea93 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -316,7 +316,8 @@ GEM
       rack-accept
       rack-mount
       virtus (>= 1.0.0)
-    grape-entity (0.5.2)
+    grape-entity (0.6.0)
+      activesupport
       multi_json (>= 1.3.2)
     haml (4.0.7)
       tilt
@@ -868,7 +869,7 @@ DEPENDENCIES
   gollum-rugged_adapter (~> 0.4.2)
   gon (~> 6.1.0)
   grape (~> 0.15.0)
-  grape-entity (~> 0.5.2)
+  grape-entity (~> 0.6.0)
   haml_lint (~> 0.18.2)
   hamlit (~> 2.6.1)
   health_check (~> 2.2.0)
diff --git a/changelogs/unreleased/zj-upgrade-grape.yml b/changelogs/unreleased/zj-upgrade-grape.yml
index 75a72283d1ed7a86b8393c091b02efc19791e09e..1df42d9873354988f6cfe55c696304bf9859a975 100644
--- a/changelogs/unreleased/zj-upgrade-grape.yml
+++ b/changelogs/unreleased/zj-upgrade-grape.yml
@@ -1,4 +1,4 @@
 ---
-title: Update grape entity to 0.5.2
+title: Update grape entity to 0.6.0
 merge_request: 7491
 author: 
diff --git a/spec/serializers/environment_serializer_spec.rb b/spec/serializers/environment_serializer_spec.rb
index 8f95c9250b0d4ca9a74b2d5c1a76dfa80baa7d9c..b7ed4eb0239d76547aeb28cf77b925300a1fce02 100644
--- a/spec/serializers/environment_serializer_spec.rb
+++ b/spec/serializers/environment_serializer_spec.rb
@@ -27,10 +27,6 @@ describe EnvironmentSerializer do
     let(:deployable) { create(:ci_build) }
     let(:resource) { deployment.environment }
 
-    it 'it generates payload for single object' do
-      expect(json).to be_an_instance_of Hash
-    end
-
     it 'contains important elements of environment' do
       expect(json)
         .to include(:name, :external_url, :environment_path, :last_deployment)