diff --git a/product/ERP5/Document/CategoryDivergenceTester.py b/product/ERP5/Document/CategoryDivergenceTester.py
index ab57e01930241252748a675655046ed201d3b640..f01ec04cca79b18a3e83fdd6c23b0fb82c07db61 100644
--- a/product/ERP5/Document/CategoryDivergenceTester.py
+++ b/product/ERP5/Document/CategoryDivergenceTester.py
@@ -30,13 +30,12 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5Type.DivergenceMessage import DivergenceMessage
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 from Products.ERP5.Document.PropertyDivergenceTester import \
                                                PropertyDivergenceTester
 
-class CategoryDivergenceTester(Predicate):
+class CategoryDivergenceTester(PropertyDivergenceTester):
   """
   The purpose of this divergence tester is to check the
   consistency between delivery movement and simulation movement
diff --git a/product/ERP5/Document/PropertyDivergenceTester.py b/product/ERP5/Document/PropertyDivergenceTester.py
index f9cbe75340cd792e5517ae4ff56aa34f50ea723d..a072444d456e0d71e91c59c290ab930f63b77082 100644
--- a/product/ERP5/Document/PropertyDivergenceTester.py
+++ b/product/ERP5/Document/PropertyDivergenceTester.py
@@ -30,16 +30,20 @@
 import zope.interface
 from AccessControl import ClassSecurityInfo
 
-from Products.ERP5Type.XMLObject import XMLObject
-
+from Products.ERP5.Document.Predicate import Predicate
 from Products.ERP5Type.DivergenceMessage import DivergenceMessage
 from Products.ERP5Type import Permissions, PropertySheet, interfaces
 
-class PropertyDivergenceTester(XMLObject):
+class PropertyDivergenceTester(Predicate):
   """
   The purpose of this divergence tester is to check the
   consistency between delivery movement and simulation movement
   for some specific properties.
+
+  NOTE: PropertyDivergenceTester will be phased out 
+        and replaced, if needed, by a mixin. Divergence 
+        Testers should be Float, String and Category
+        DivergenceTester
   """
   meta_type = 'ERP5 Property Divergence Tester'
   portal_type = 'Property Divergence Tester'