diff --git a/obp-api/src/test/scala/code/api/v6_0_0/CustomViewsTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/CustomViewsTest.scala
index 99ec98080..d413071f2 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/CustomViewsTest.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/CustomViewsTest.scala
@@ -3,7 +3,7 @@ package code.api.v6_0_0
 import code.api.util.APIUtil.OAuth._
 import code.api.util.ApiRole.{CanCreateCustomView, CanGetCustomViews}
 import code.api.util.ErrorMessages
-import code.api.util.ErrorMessages.UserHasMissingRoles
+import code.api.util.ErrorMessages.{InvalidCustomViewFormat, InvalidJsonFormat, UserHasMissingRoles}
 import code.api.v6_0_0.APIMethods600.Implementations6_0_0
 import code.entitlement.Entitlement
 import code.setup.DefaultUsers
@@ -125,7 +125,7 @@ class CustomViewsTest extends V600ServerSetup with DefaultUsers {
       
       Then("The automatic role guard should reject the request")
       responseWithoutRole.code should equal(403)
-      responseWithoutRole.body.extract[ErrorMessage].message should contain(CanGetCustomViews.toString)
+      responseWithoutRole.body.extract[ErrorMessage].message should equal(UserHasMissingRoles + CanGetCustomViews.toString)
       
       When("The same user is granted the required role")
       Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanGetCustomViews.toString)
@@ -271,7 +271,7 @@ class CustomViewsTest extends V600ServerSetup with DefaultUsers {
       response.code should equal(400)
       
       And("Error message should indicate invalid custom view format")
-      response.body.extract[ErrorMessage].message should include("InvalidCustomViewFormat")
+      response.body.extract[ErrorMessage].message should include(InvalidCustomViewFormat)
     }
 
     scenario("We verify automatic role guard from ResourceDoc configuration for management endpoint", ApiEndpoint2, VersionOfApi) {
@@ -295,7 +295,7 @@ class CustomViewsTest extends V600ServerSetup with DefaultUsers {
       
       Then("The automatic role guard should reject the request")
       responseWithoutRole.code should equal(403)
-      responseWithoutRole.body.extract[ErrorMessage].message should contain(CanCreateCustomView.toString)
+      responseWithoutRole.body.extract[ErrorMessage].message should equal(UserHasMissingRoles + CanCreateCustomView.toString)
       
       When("The same user is granted the required role")
       Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanCreateCustomView.toString)
@@ -325,7 +325,7 @@ class CustomViewsTest extends V600ServerSetup with DefaultUsers {
       response.code should equal(400)
       
       And("Error message should indicate invalid JSON format")
-      response.body.extract[ErrorMessage].message should include("InvalidJsonFormat")
+      response.body.extract[ErrorMessage].message should include(InvalidJsonFormat)
     }
   }
 }
\ No newline at end of file
diff --git a/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
index 188b03e0c..90aaeca7e 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/PasswordResetTest.scala
@@ -91,8 +91,8 @@ class PasswordResetTest extends V600ServerSetup {
       When("We make a request v6.0.0 without a Role " + canCreateResetPasswordUrl)
       val request600 = (v6_0_0_Request / "management" / "user" / "reset-password-url").POST <@(user1)
       val response600 = makePostRequest(request600, write(postJson))
-      Then("We should get a 400")
-      response600.code should equal(400)
+      Then("We should get a 403")
+      response600.code should equal(403)
       And("error should be " + UserHasMissingRoles + CanCreateResetPasswordUrl)
       response600.body.extract[ErrorMessage].message should equal((UserHasMissingRoles + CanCreateResetPasswordUrl))
     }
diff --git a/obp-api/src/test/scala/code/api/v6_0_0/SystemViewsTest.scala b/obp-api/src/test/scala/code/api/v6_0_0/SystemViewsTest.scala
index 35bfc2d4d..2891e33ba 100644
--- a/obp-api/src/test/scala/code/api/v6_0_0/SystemViewsTest.scala
+++ b/obp-api/src/test/scala/code/api/v6_0_0/SystemViewsTest.scala
@@ -89,8 +89,8 @@ class SystemViewsTest extends V600ServerSetup with DefaultUsers {
       
       Then("The automatic role guard should reject the request")
       responseWithoutRole.code should equal(403)
-      responseWithoutRole.body.extract[ErrorMessage].message should contain(CanGetSystemViews.toString)
-      
+      responseWithoutRole.body.extract[ErrorMessage].message should be (UserHasMissingRoles + CanGetSystemViews)
+
       When("The same user is granted the required role")
       Entitlement.entitlement.vend.addEntitlement("", resourceUser1.userId, CanGetSystemViews.toString)
       val requestWithRole = (v6_0_0_Request / "management" / "system-views").GET <@ (user1)