diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index dd7b1b372af2a560e9d5cbefb548a73b5a53d55c..eca2d7aa18773d427dd6bb4d301637b3d80c6ef4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+Version 2021.04.06
+------------------
+
+- Validate group names (INFRA-3135)
+- Add warning text for creating vm (INFRA-3292)
+- Paginate history in ansible groups and hosts (INFRA-3136)
+
 Version 2020.11.25
 ------------------
 
diff --git a/tests/functional/test_api.py b/tests/functional/test_api.py
index c9f1a71395b4df8098b0ae96a9c3e7e74260967a..9945decae45d265db56058b22ad16cab35456289 100644
--- a/tests/functional/test_api.py
+++ b/tests/functional/test_api.py
@@ -1568,7 +1568,7 @@ def test_create_ansible_group(client, admin_token):
     response = post(client, f"{API_URL}/network/groups", data=data, token=admin_token)
     check_response_message(
         response,
-        "(psycopg2.errors.UniqueViolation) duplicate key value violates unique constraint",
+        "Group name matches an existing group",
         422,
     )