diff --git a/ipaserver/plugins/baseldap.py b/ipaserver/plugins/baseldap.py
index 62b726da1..c35f660c7 100644
--- a/ipaserver/plugins/baseldap.py
+++ b/ipaserver/plugins/baseldap.py
@@ -2159,7 +2159,7 @@ class LDAPAddReverseMember(LDAPModReverseMember):
                 failed['member'][self.reverse_attr].append((attr, unicode(e)))
 
         # Update the member data.
-        entry_attrs = ldap.get_entry(dn, ['*'])
+        entry_attrs = ldap.get_entry(dn, attrs_list)
         self.obj.convert_attribute_members(entry_attrs, *keys, **options)
 
         for callback in self.get_callbacks('post'):
@@ -2258,7 +2258,7 @@ class LDAPRemoveReverseMember(LDAPModReverseMember):
                 failed['member'][self.reverse_attr].append((attr, unicode(e)))
 
         # Update the member data.
-        entry_attrs = ldap.get_entry(dn, ['*'])
+        entry_attrs = ldap.get_entry(dn, attrs_list)
         self.obj.convert_attribute_members(entry_attrs, *keys, **options)
 
         for callback in self.get_callbacks('post'):
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index d7061c62c..fe4a5b959 100644
--- a/ipatests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -484,7 +484,6 @@ class test_permission(Declarative):
                     'cn': [privilege1],
                     'description': [u'privilege desc. 1'],
                     'memberof_permission': [permission1],
-                    'objectclass': objectclasses.privilege,
                 }
             ),
         ),
@@ -3067,7 +3066,6 @@ def _make_permission_flag_tests(flags, expected_message):
                     'cn': [privilege1],
                     'description': [u'privilege desc. 1'],
                     'memberof_permission': [permission1],
-                    'objectclass': objectclasses.privilege,
                 }
             ),
         ),
@@ -3310,7 +3308,6 @@ class test_permission_bindtype(Declarative):
                     dn=privilege1_dn,
                     cn=[privilege1],
                     description=[u'privilege desc. 1'],
-                    objectclass=objectclasses.privilege,
                 ),
             ),
         ),
@@ -3419,7 +3416,6 @@ class test_permission_bindtype(Declarative):
                     cn=[privilege1],
                     description=[u'privilege desc. 1'],
                     memberof_permission=[permission1],
-                    objectclass=objectclasses.privilege,
                 )
             ),
         ),
diff --git a/ipatests/test_xmlrpc/test_role_plugin.py b/ipatests/test_xmlrpc/test_role_plugin.py
index 74ff505cc..6771cfad5 100644
--- a/ipatests/test_xmlrpc/test_role_plugin.py
+++ b/ipatests/test_xmlrpc/test_role_plugin.py
@@ -199,7 +199,6 @@ class test_role(Declarative):
                     'cn': [role1],
                     'description': [u'role desc 1'],
                     'memberof_privilege': [privilege1],
-                    'objectclass': objectclasses.role,
                 }
             ),
         ),
@@ -221,7 +220,6 @@ class test_role(Declarative):
                     'cn': [role1],
                     'description': [u'role desc 1'],
                     'memberof_privilege': [privilege1],
-                    'objectclass': objectclasses.role,
                 }
             ),
         ),
@@ -243,7 +241,6 @@ class test_role(Declarative):
                     'cn': [role1],
                     'description': [u'role desc 1'],
                     'memberof_privilege': [privilege1],
-                    'objectclass': objectclasses.role,
                 }
             ),
         ),
@@ -603,7 +600,6 @@ class test_role(Declarative):
                     'dn': role1_dn,
                     'cn': [role1],
                     'description': [u'New desc 1'],
-                    'objectclass': objectclasses.role,
                 }
             ),
         ),
@@ -625,7 +621,6 @@ class test_role(Declarative):
                     'dn': role1_dn,
                     'cn': [role1],
                     'description': [u'New desc 1'],
-                    'objectclass': objectclasses.role,
                 }
             ),
         ),