diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py
index 5746b57..14a9741 100644
--- a/tests/test_pagure_flask_api_issue.py
+++ b/tests/test_pagure_flask_api_issue.py
@@ -308,9 +308,11 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
         output = self.app.post('/api/0/test2/new_issue', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # No input
         output = self.app.post('/api/0/test/new_issue', headers=headers)
@@ -1847,9 +1849,11 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
         output = self.app.get('/api/0/test/issue/6', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # Create a new token for another user
         item = pagure.lib.model.Token(
@@ -1975,9 +1979,11 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
         output = self.app.post('/api/0/test2/issue/1/milestone', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # No issue
         output = self.app.post('/api/0/test/issue/1/milestone', headers=headers)
@@ -2140,9 +2146,11 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
             '/api/0/foo/issue/1/milestone', data=data, headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
@@ -2376,9 +2384,11 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
         output = self.app.post('/api/0/test2/issue/1/assign', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # No input
         output = self.app.post('/api/0/test/issue/1/assign', headers=headers)
@@ -2558,9 +2568,11 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
             '/api/0/foo/issue/1/assign', data=data, headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # No comment added
         repo = pagure.lib.get_authorized_project(self.session, 'foo')
@@ -2699,9 +2711,11 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
             '/api/0/test2/issue/1/subscribe', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # No input
         output = self.app.post(
@@ -2839,9 +2853,11 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
             '/api/0/test2/issue/1/custom/bugzilla', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # No issue
         output = self.app.post(
@@ -2917,14 +2933,11 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
             '/api/0/test/issue/1/custom/bugzilla', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertDictEqual(
-            data,
-            {
-              "error": "Invalid or expired token. Please visit "
-                  "https://pagure.org/ to get or renew your API token.",
-              "error_code": "EINVALIDTOK",
-            }
-        )
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         headers = {'Authorization': 'token aaabbbcccddd'}
 
diff --git a/tests/test_pagure_flask_api_project.py b/tests/test_pagure_flask_api_project.py
index af4aad3..b9713e5 100644
--- a/tests/test_pagure_flask_api_project.py
+++ b/tests/test_pagure_flask_api_project.py
@@ -1983,9 +1983,11 @@ class PagureFlaskApiProjecttests(tests.Modeltests):
         output = self.app.post('/api/0/new', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         headers = {'Authorization': 'token aaabbbcccddd'}
 
@@ -2102,9 +2104,11 @@ class PagureFlaskApiProjecttests(tests.Modeltests):
         output = self.app.post('/api/0/new', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         headers = {'Authorization': 'token aaabbbcccddd'}
 
@@ -2284,9 +2288,11 @@ class PagureFlaskApiProjecttests(tests.Modeltests):
         output = self.app.post('/api/0/fork', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         headers = {'Authorization': 'token aaabbbcccddd'}
 
@@ -2408,9 +2414,11 @@ class PagureFlaskApiProjecttests(tests.Modeltests):
         output = self.app.post('/api/0/fork', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.name,
-                         data['error_code'])
-        self.assertEqual(pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         headers = {'Authorization': 'token aaabbbcccddd'}
 
@@ -2896,12 +2904,11 @@ class PagureFlaskApiProjectFlagtests(tests.Modeltests):
             headers=headers, data=data)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.data)
-        expected_output = {
-            "error": "Invalid or expired token. Please visit "
-            "https://pagure.org/ to get or renew your API token.",
-            "error_code": "EINVALIDTOK"
-        }
-        self.assertEqual(data, expected_output)
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
     def test_flag_commit_invalid_status(self):
         """ Test flagging a commit with an invalid status. """
diff --git a/tests/test_pagure_flask_api_ui_private_repo.py b/tests/test_pagure_flask_api_ui_private_repo.py
index e56aeb6..1530504 100644
--- a/tests/test_pagure_flask_api_ui_private_repo.py
+++ b/tests/test_pagure_flask_api_ui_private_repo.py
@@ -1630,14 +1630,11 @@ class PagurePrivateRepotest(tests.Modeltests):
             '/api/0/test2/pull-request/1/flag', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.get_data(as_text=True))
-        self.assertDictEqual(
-            data,
-            {
-                "error": "Invalid or expired token. Please visit "
-                         "https://pagure.org/ to get or renew your API token.",
-                "error_code": "EINVALIDTOK",
-            }
-        )
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # No input
         output = self.app.post(
@@ -1859,14 +1856,11 @@ class PagurePrivateRepotest(tests.Modeltests):
             '/api/0/test2/pull-request/1/close', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.get_data(as_text=True))
-        self.assertDictEqual(
-            data,
-            {
-                "error": "Invalid or expired token. Please visit "
-                         "https://pagure.org/ to get or renew your API token.",
-                "error_code": "EINVALIDTOK",
-            }
-        )
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # Invalid PR
         output = self.app.post(
@@ -2006,14 +2000,11 @@ class PagurePrivateRepotest(tests.Modeltests):
             '/api/0/test2/pull-request/1/merge', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.get_data(as_text=True))
-        self.assertDictEqual(
-            data,
-            {
-                "error": "Invalid or expired token. Please visit "
-                         "https://pagure.org/ to get or renew your API token.",
-                "error_code": "EINVALIDTOK",
-            }
-        )
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # Invalid PR
         output = self.app.post(
@@ -2117,14 +2108,11 @@ class PagurePrivateRepotest(tests.Modeltests):
         output = self.app.post('/api/0/test2/new_issue', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.get_data(as_text=True))
-        self.assertDictEqual(
-            data,
-            {
-                "error": "Invalid or expired token. Please visit "
-                         "https://pagure.org/ to get or renew your API token.",
-                "error_code": "EINVALIDTOK",
-            }
-        )
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         # No input
         output = self.app.post('/api/0/test4/new_issue', headers=headers)
@@ -2645,13 +2633,11 @@ class PagurePrivateRepotest(tests.Modeltests):
         output = self.app.get('/api/0/test4/issue/1', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.get_data(as_text=True))
-        self.assertDictEqual(
-            data,
-            {
-                "error": "Invalid or expired token. Please visit https://pagure.org/ to get or renew your API token.",
-                "error_code": "EINVALIDTOK"
-            }
-        )
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         headers = {'Authorization': 'token aaabbbcccddd'}
 
@@ -2872,14 +2858,11 @@ class PagurePrivateRepotest(tests.Modeltests):
         output = self.app.post('/api/0/test4/issue/1/comment', headers=headers)
         self.assertEqual(output.status_code, 401)
         data = json.loads(output.get_data(as_text=True))
-        self.assertDictEqual(
-            data,
-            {
-                "error": "Invalid or expired token. Please visit "
-                         "https://pagure.org/ to get or renew your API token.",
-                "error_code": "EINVALIDTOK",
-            }
-        )
+        self.assertEqual(sorted(data.keys()), ['error', 'error_code'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.value, data['error'])
+        self.assertEqual(
+            pagure.api.APIERROR.EINVALIDTOK.name, data['error_code'])
 
         headers = {'Authorization': 'token aaabbbcccddd'}
         # No input