diff --git a/kong/tests/test_servers.py b/kong/tests/test_servers.py
index 5e27194..f81f6a2 100644
--- a/kong/tests/test_servers.py
+++ b/kong/tests/test_servers.py
@@ -25,24 +25,20 @@
     def _assert_server_entity(self, server):
         actual_keys = set(server.keys())
         expected_keys = set((
-            'id',
-            'name',
-            'hostId',
-            'status',
-            'metadata',
-            'addresses',
-            'links',
-            'progress',
-            'image',
-            'flavor',
-            'created',
-            'updated',
             'accessIPv4',
             'accessIPv6',
-
-            #KNOWN-ISSUE lp804093
-            'uuid',
-
+            'addresses',
+            'created',
+            'flavor',
+            'hostId',
+            'id',
+            'image',
+            'links',
+            'metadata',
+            'name',
+            'progress',
+            'status',
+            'updated',
         ))
         self.assertTrue(expected_keys <= actual_keys)