diff --git a/openerp/addons/base/res/res_partner_demo.xml b/openerp/addons/base/res/res_partner_demo.xml
index fece3c480aa..1e635820f4c 100644
--- a/openerp/addons/base/res/res_partner_demo.xml
+++ b/openerp/addons/base/res/res_partner_demo.xml
@@ -6,7 +6,7 @@
         -->
 
         <record id="res_partner_category_0" model="res.partner.category">
-            <field name="name">Customer</field>
+            <field name="name">Partner</field>
         </record>
         <record id="res_partner_category_1" model="res.partner.category">
             <field name="name">Supplier</field>
@@ -18,15 +18,15 @@
             <field name="name">Employee</field>
         </record>
         <record id="res_partner_category_4" model="res.partner.category">
-            <field name="name">Gold Partner</field>
+            <field name="name">Gold</field>
             <field name="parent_id" ref="res_partner_category_0"/>
         </record>
         <record id="res_partner_category_5" model="res.partner.category">
-            <field name="name">Silver Partner</field>
+            <field name="name">Silver</field>
             <field name="parent_id" ref="res_partner_category_0"/>
         </record>
         <record id="res_partner_category_6" model="res.partner.category">
-            <field name="name">Bronze Partner</field>
+            <field name="name">Bronze</field>
             <field name="parent_id" ref="res_partner_category_0"/>
         </record>
         <record id="res_partner_category_7" model="res.partner.category">
@@ -35,35 +35,27 @@
         </record>
         <record id="res_partner_category_8" model="res.partner.category">
             <field name="name">Consultancy Services</field>
-            <field name="parent_id" ref="res_partner_category_0"/>
         </record>
         <record id="res_partner_category_9" model="res.partner.category">
             <field name="name">Components Buyer</field>
-            <field name="parent_id" ref="res_partner_category_0"/>
         </record>
         <record id="res_partner_category_11" model="res.partner.category">
             <field name="name">Services</field>
-            <field name="parent_id" ref="res_partner_category_1"/>
         </record>
         <record id="res_partner_category_12" model="res.partner.category">
             <field name="name">Office Supplies</field>
-            <field name="parent_id" ref="res_partner_category_1"/>
         </record>
         <record id="res_partner_category_13" model="res.partner.category">
             <field name="name">Distributor</field>
-            <field name="parent_id" ref="res_partner_category_1"/>
         </record>
         <record id="res_partner_category_14" model="res.partner.category">
             <field name="name">Manufacturer</field>
-            <field name="parent_id" ref="res_partner_category_1"/>
         </record>
         <record id="res_partner_category_15" model="res.partner.category">
             <field name="name">Wholesaler</field>
-            <field name="parent_id" ref="res_partner_category_1"/>
         </record>
         <record id="res_partner_category_16" model="res.partner.category">
             <field name="name">Retailer</field>
-            <field name="parent_id" ref="res_partner_category_1"/>
         </record>
         <record id="res_partner_category_17" model="res.partner.category">
             <field name="name">Company Contact</field>
diff --git a/openerp/addons/base/test/test_osv_expression.yml b/openerp/addons/base/test/test_osv_expression.yml
index 03c5bad9328..d607b17f801 100644
--- a/openerp/addons/base/test/test_osv_expression.yml
+++ b/openerp/addons/base/test/test_osv_expression.yml
@@ -2,22 +2,8 @@
     Testing for hierarchical search in M2M
 -
     !python {model: res.partner }: |
-        ids = self.search(cr, uid, [('category_id', 'child_of','supplier')])
+        ids = self.search(cr, uid, [('category_id', 'child_of',ref('res_partner_category_0'))])
         assert len(ids) >= 1, ids
-
--
-    Test hierarchical search in M2M with child ID1
--
-    !python {model: res.partner }: |
-        ids = self.search(cr, uid, [('category_id', 'child_of','Customer')])
-        assert len(ids) >= 1, ids
--
-    Test hierarchical search in M2M with child ID2
--
-    !python {model: res.partner }: |
-        ids = self.search(cr, uid, [('category_id', 'child_of','Manufacturer')])
-        assert len(ids) == 2, ids
-
 -
     "1.0 Setup test partner categories: parent root"
 -