diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
index 114f881c4..c5e10072f 100644
--- a/e2e/tests/test_e2e.py
+++ b/e2e/tests/test_e2e.py
@@ -222,7 +222,7 @@ class EndToEndTestCase(unittest.TestCase):
             }
         })
 
-        # make sure we let one sync pass and the new user being added
+        # make sure we let one sync pass and check if the new user being added
         time.sleep(15)
 
         leader = self.k8s.get_cluster_leader_pod()
@@ -235,6 +235,58 @@ class EndToEndTestCase(unittest.TestCase):
         self.eventuallyEqual(lambda: len(users), 2, 
             "Not all additional users found in database: {}".format(users))
 
+        # replace additional member and check if the removed member's role is renamed
+        self.k8s.api.custom_objects_api.patch_namespaced_custom_object(
+        'acid.zalan.do', 'v1', 'default',
+        'postgresteams', 'custom-team-membership',
+        {
+            'spec': {
+                'additionalMembers': {
+                    'e2e': [
+                        'tester'
+                    ]
+                },
+            }
+        })
+
+        # wait for another sync
+        time.sleep(15)
+
+        user_query = """
+            SELECT usename
+              FROM pg_catalog.pg_user
+             WHERE usename IN ('tester', 'kind_delete_me');
+        """
+        users = self.query_database(leader.metadata.name, "postgres", user_query)
+        self.eventuallyEqual(lambda: len(users), 2, 
+            "CRD changes not reflected in database: {}".format(users))
+
+        # re-add additional member and check if the role is renamed back
+        self.k8s.api.custom_objects_api.patch_namespaced_custom_object(
+        'acid.zalan.do', 'v1', 'default',
+        'postgresteams', 'custom-team-membership',
+        {
+            'spec': {
+                'additionalMembers': {
+                    'e2e': [
+                        'kind'
+                    ]
+                },
+            }
+        })
+
+        # wait for another sync
+        time.sleep(15)
+
+        user_query = """
+            SELECT usename
+              FROM pg_catalog.pg_user
+             WHERE usename IN ('tester_delete_me', 'kind');
+        """
+        users = self.query_database(leader.metadata.name, "postgres", user_query)
+        self.eventuallyEqual(lambda: len(users), 2, 
+            "CRD changes not reflected in database: {}".format(users))
+
         # revert config change
         revert_resync = {
             "data": {
diff --git a/pkg/teams/postgres_team_test.go b/pkg/teams/postgres_team_test.go
index f138ec124..dec020c7d 100644
--- a/pkg/teams/postgres_team_test.go
+++ b/pkg/teams/postgres_team_test.go
@@ -9,8 +9,6 @@ import (
 )
 
 var (
-	True       = true
-	False      = false
 	pgTeamList = acidv1.PostgresTeamList{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "List",