diff --git a/trytond/trytond/model/fields/field.py b/trytond/trytond/model/fields/field.py
index aba79f1d4d..e8fa93d57c 100644
--- a/trytond/trytond/model/fields/field.py
+++ b/trytond/trytond/model/fields/field.py
@@ -142,7 +142,9 @@ def _iter_eval_fields(value):
 
 def get_eval_fields(value):
     "Return fields evaluated"
-    return set(_iter_eval_fields(value))
+    fields = set(_iter_eval_fields(value))
+    fields.discard('context')  # TODO: remove when context is renamed
+    return fields
 
 
 def instanciate_values(Target, value, **extra):
diff --git a/trytond/trytond/tests/test_tryton.py b/trytond/trytond/tests/test_tryton.py
index a2a159d524..61b8aaf29f 100644
--- a/trytond/trytond/tests/test_tryton.py
+++ b/trytond/trytond/tests/test_tryton.py
@@ -452,7 +452,11 @@ class ModuleTestCase(unittest.TestCase):
                     for attribute in [
                             'depends', 'on_change', 'on_change_with',
                             'selection_change_with', 'autocomplete']:
-                        depends = getattr(field, attribute, [])
+                        depends = getattr(field, attribute, set())
+                        if attribute == 'depends':
+                            depends |= field.display_depends
+                            depends |= field.edition_depends
+                            depends |= field.validation_depends
                         qualname = '"%s"."%s"."%s"' % (mname, fname, attribute)
                         for depend in depends:
                             test_depend_exists(model, depend, qualname)