diff --git a/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
index 67cf11b..0e494ef 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
@@ -272,9 +272,9 @@
         public boolean matchesSafely(JsonObject jsonGroup) {
             // check id
             final String jsonId = jsonGroup.get("id").asString();
-            final String groupId = group.id().toString();
+            final String groupId = group.id().id().toString();
             if (!jsonId.equals(groupId)) {
-                reason = "id " + group.id().toString();
+                reason = "id " + group.id().id().toString();
                 return false;
             }
 
@@ -356,7 +356,7 @@
 
                 final JsonObject jsonGroup = json.get(jsonGroupIndex).asObject();
 
-                final String groupId = group.id().toString();
+                final String groupId = group.id().id().toString();
                 final String jsonGroupId = jsonGroup.get("id").asString();
                 if (jsonGroupId.equals(groupId)) {
                     groupFound = true;
@@ -366,7 +366,7 @@
                 }
             }
             if (!groupFound) {
-                reason = "Group with id " + group.id().toString() + " not found";
+                reason = "Group with id " + group.id().id().toString() + " not found";
                 return false;
             } else {
                 return true;
