diff --git a/test/basetest/task.py b/test/basetest/task.py
index f83bb0358..a5a81c256 100644
--- a/test/basetest/task.py
+++ b/test/basetest/task.py
@@ -114,18 +114,17 @@ class Task(object):
         """
         if taskd_user is None:
             if default:
-                user, group, org, userkey = self.taskd.default_user
+                user, org, userkey = self.taskd.default_user
             else:
-                user, group, org, userkey = self.taskd.create_user()
+                user, org, userkey = self.taskd.create_user()
         else:
-            user, group, org, userkey = taskd_user
+            user, org, userkey = taskd_user
 
         credentials = "/".join((org, user, userkey))
         self.config("taskd.credentials", credentials)
 
         self.credentials = {
             "user": user,
-            "group": group,
             "org": org,
             "userkey": userkey,
         }
diff --git a/test/basetest/taskd.py b/test/basetest/taskd.py
index eb6ea52ce..e30fe5d00 100644
--- a/test/basetest/taskd.py
+++ b/test/basetest/taskd.py
@@ -110,9 +110,8 @@ class Taskd(object):
         # Make sure TASKDDATA points to the temporary folder
         self.env["TASKDDATA"] = self.datadir
 
-    def create_user(self, user=None, group=None, org=None):
-        """Create a user/group in the server and return the user
-        credentials to use in a taskw client.
+    def create_user(self, user=None, org=None):
+        """Create a user in the server and return the user credentials to use in a taskw client.
         """
         if user is None:
             # Create a unique user ID
@@ -122,20 +121,16 @@ class Taskd(object):
             # Increment the user_id
             self.usercount += 1
 
-        if group is None:
-            group = "default_group"
-
         if org is None:
             org = "default_org"
 
         self._add_entity("org", org, ignore_exists=True)
-        self._add_entity("group", org, group, ignore_exists=True)
         userkey = self._add_entity("user", org, user)
 
-        return user, group, org, userkey
+        return user, org, userkey
 
     def _add_entity(self, keyword, org, value=None, ignore_exists=False):
-        """Add an organization, group or user to the current server
+        """Add an organization or user to the current server
 
         If a user creation is requested, the user unique ID is returned
         """