diff --git a/test/suites/test_dml.py b/test/suites/test_dml.py
index 50b71905..26539eec 100644
--- a/test/suites/test_dml.py
+++ b/test/suites/test_dml.py
@@ -391,7 +391,12 @@ def test_15_extra_error_info_stacked(self):
             self.assertEqual(exc.extra_info.message, "Timeout exceeded")
             self.assertEqual(exc.extra_info.errno, 0)
             self.assertEqual(exc.extra_info.errcode, 78)
-            self.assertEqual(exc.extra_info.fields, None)
+            actual_fields = exc.extra_info.fields
+            if actual_fields is None:
+                actual_fields = {}
+            expected_fields = {}
+            self.assertGreaterEqual(actual_fields.items(),
+                                    expected_fields.items())
             self.assertNotEqual(exc.extra_info.prev, None)
             prev = exc.extra_info.prev
             self.assertEqual(prev.type, 'ClientError')
@@ -400,7 +405,12 @@ def test_15_extra_error_info_stacked(self):
             self.assertEqual(prev.message, "Unknown error")
             self.assertEqual(prev.errno, 0)
             self.assertEqual(prev.errcode, 0)
-            self.assertEqual(prev.fields, None)
+            actual_fields = prev.fields
+            if actual_fields is None:
+                actual_fields = {}
+            expected_fields = {}
+            self.assertGreaterEqual(actual_fields.items(),
+                                    expected_fields.items())
         else:
             self.fail('Expected error')
 
diff --git a/test/suites/test_error_ext.py b/test/suites/test_error_ext.py
index c6cdf4b5..d5e96e75 100644
--- a/test/suites/test_error_ext.py
+++ b/test/suites/test_error_ext.py
@@ -327,11 +327,14 @@ def test_tarantool_decode(self):
                     self.assertEqual(err.message, expected_err.message)
                     self.assertEqual(err.errno, expected_err.errno)
                     self.assertEqual(err.errcode, expected_err.errcode)
-                    if expected_err.fields is not None:
-                        self.assertGreaterEqual(err.fields.items(),
-                                                expected_err.fields.items())
-                    else:
-                        self.assertEqual(err.fields, None)
+                    expected_fields = expected_err.fields
+                    if expected_fields is None:
+                        expected_fields = {}
+                    actual_fields = err.fields
+                    if actual_fields is None:
+                        actual_fields = {}
+                    self.assertGreaterEqual(actual_fields.items(),
+                                            expected_fields.items())
 
                     err = err.prev
                     expected_err = expected_err.prev