diff --git a/openstackclient/tests/functional/base.py b/openstackclient/tests/functional/base.py
index fb78ea6250..8574329621 100644
--- a/openstackclient/tests/functional/base.py
+++ b/openstackclient/tests/functional/base.py
@@ -16,7 +16,6 @@ import shlex
 import subprocess
 import testtools
 
-import six
 from tempest.lib.cli import output_parser
 from tempest.lib import exceptions
 
@@ -88,23 +87,17 @@ class TestCase(testtools.TestCase):
             for field in field_names:
                 self.assertIn(field, item)
 
-    def assert_show_fields(self, items, field_names):
+    def assert_show_fields(self, show_output, field_names):
         """Verify that all items have keys listed in field_names."""
-        for item in items:
-            for key in six.iterkeys(item):
-                self.assertIn(key, field_names)
 
-    def assert_show_structure(self, items, field_names):
-        """Verify that all field_names listed in keys of all items."""
-        if isinstance(items, list):
-            o = {}
-            for d in items:
-                o.update(d)
-        else:
-            o = items
-        item_keys = o.keys()
-        for field in field_names:
-            self.assertIn(field, item_keys)
+        # field_names = ['name', 'description']
+        # show_output = [{'name': 'fc2b98d8faed4126b9e371eda045ade2'},
+        #          {'description': 'description-821397086'}]
+        # this next line creates a flattened list of all 'keys' (like 'name',
+        # and 'description' out of the output
+        all_headers = [item for sublist in show_output for item in sublist]
+        for field_name in field_names:
+            self.assertIn(field_name, all_headers)
 
     def parse_show_as_object(self, raw_output):
         """Return a dict with values parsed from cli output."""
diff --git a/openstackclient/tests/functional/identity/v2/common.py b/openstackclient/tests/functional/identity/v2/common.py
index b390c5bc15..ad02f7791b 100644
--- a/openstackclient/tests/functional/identity/v2/common.py
+++ b/openstackclient/tests/functional/identity/v2/common.py
@@ -22,14 +22,13 @@ BASIC_LIST_HEADERS = ['ID', 'Name']
 class IdentityTests(base.TestCase):
     """Functional tests for Identity commands. """
 
-    USER_FIELDS = ['email', 'enabled', 'id', 'name', 'project_id',
-                   'username', 'domain_id', 'default_project_id']
-    PROJECT_FIELDS = ['enabled', 'id', 'name', 'description', 'domain_id']
+    USER_FIELDS = ['email', 'enabled', 'id', 'name', 'project_id', 'username']
+    PROJECT_FIELDS = ['enabled', 'id', 'name', 'description']
     TOKEN_FIELDS = ['expires', 'id', 'project_id', 'user_id']
-    ROLE_FIELDS = ['id', 'name', 'links', 'domain_id']
+    ROLE_FIELDS = ['id', 'name', 'domain_id']
     SERVICE_FIELDS = ['id', 'enabled', 'name', 'type', 'description']
     ENDPOINT_FIELDS = ['id', 'region', 'service_id', 'service_name',
-                       'service_type', 'enabled', 'publicurl',
+                       'service_type', 'publicurl',
                        'adminurl', 'internalurl']
 
     EC2_CREDENTIALS_FIELDS = ['access', 'project_id', 'secret',
diff --git a/openstackclient/tests/functional/identity/v3/common.py b/openstackclient/tests/functional/identity/v3/common.py
index 3b6fc27b97..a509574cb7 100644
--- a/openstackclient/tests/functional/identity/v3/common.py
+++ b/openstackclient/tests/functional/identity/v3/common.py
@@ -23,15 +23,15 @@ BASIC_LIST_HEADERS = ['ID', 'Name']
 class IdentityTests(base.TestCase):
     """Functional tests for Identity commands. """
 
-    DOMAIN_FIELDS = ['description', 'enabled', 'id', 'name', 'links']
-    GROUP_FIELDS = ['description', 'domain_id', 'id', 'name', 'links']
+    DOMAIN_FIELDS = ['description', 'enabled', 'id', 'name']
+    GROUP_FIELDS = ['description', 'domain_id', 'id', 'name']
     TOKEN_FIELDS = ['expires', 'id', 'project_id', 'user_id']
     USER_FIELDS = ['email', 'enabled', 'id', 'name', 'name',
                    'domain_id', 'default_project_id', 'description',
                    'password_expires_at']
     PROJECT_FIELDS = ['description', 'id', 'domain_id', 'is_domain',
-                      'enabled', 'name', 'parent_id', 'links']
-    ROLE_FIELDS = ['id', 'name', 'links', 'domain_id']
+                      'enabled', 'name', 'parent_id']
+    ROLE_FIELDS = ['id', 'name', 'domain_id']
     SERVICE_FIELDS = ['id', 'enabled', 'name', 'type', 'description']
     REGION_FIELDS = ['description', 'enabled', 'parent_region', 'region']
     ENDPOINT_FIELDS = ['id', 'region', 'region_id', 'service_id',