diff --git a/spec/requests/api/fork_spec.rb b/spec/requests/api/fork_spec.rb
index cbbd1e7de5a77beacd365cf6af77f83c16b2eae9..5921b3e06983d930ecb97a5f6703e72ea3205159 100644
--- a/spec/requests/api/fork_spec.rb
+++ b/spec/requests/api/fork_spec.rb
@@ -44,7 +44,7 @@ describe API::API, api: true  do
       it 'should fail on missing project access for the project to fork' do
         post api("/projects/fork/#{project.id}", user3)
         response.status.should == 404
-        json_response['message'].should == '404 Not Found'
+        json_response['message'].should == '404 Project Not Found'
       end
 
       it 'should fail if forked project exists in the user namespace' do
@@ -58,7 +58,7 @@ describe API::API, api: true  do
       it 'should fail if project to fork from does not exist' do
         post api('/projects/fork/424242', user)
         response.status.should == 404
-        json_response['message'].should == '404 Not Found'
+        json_response['message'].should == '404 Project Not Found'
       end
     end
 
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 8dfd2cd650e79965f2ebf24c388aada08553d8da..a5aade06cba6f1e27aa75759ac020d9a6cf63e4d 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -91,7 +91,8 @@ describe API::API, api: true  do
 
       it "should not create group, duplicate" do
         post api("/groups", admin), {name: "Duplicate Test", path: group2.path}
-        response.status.should == 404
+        response.status.should == 422
+        response.message.should == "Unprocessable Entity"
       end
 
       it "should return 400 bad request error if name not given" do
diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb
index f8c5d40b9bf56d0f28135eeae168b508fe99a4ac..79865f15f062ec3f6af0eefee9bd1f531b5f997d 100644
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
@@ -289,7 +289,7 @@ describe API::API, api: true  do
     it "should return a 404 error if not found" do
       get api("/projects/42", user)
       response.status.should == 404
-      json_response['message'].should == '404 Not Found'
+      json_response['message'].should == '404 Project Not Found'
     end
 
     it "should return a 404 error if user is not a member" do
@@ -340,7 +340,7 @@ describe API::API, api: true  do
     it "should return a 404 error if not found" do
       get api("/projects/42/events", user)
       response.status.should == 404
-      json_response['message'].should == '404 Not Found'
+      json_response['message'].should == '404 Project Not Found'
     end
 
     it "should return a 404 error if user is not a member" do