diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml
index 7f34eb6697c..06db5a56d3d 100644
--- a/addons/auction/auction_demo.xml
+++ b/addons/auction/auction_demo.xml
@@ -39,7 +39,7 @@
         <field name="name">Auction Adjudications</field>
         <field name="code">A7x*</field>
         <field name="user_type" ref="account.account_type_income"/> 
-        <field name="type">receivable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_income_view"/>
     </record>
@@ -48,7 +48,7 @@
         <field name="name">Auction Adjudication Expenses</field>
         <field name="code">A6x*</field>
         <field name="user_type" ref="account.account_type_expense"/>
-        <field name="type">payable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_expense_view"/>
     </record>
@@ -56,7 +56,7 @@
     <record model="account.account" id="auction_income_costs">
         <field name="name">Auction Buyer Costs</field>
         <field name="code">A8x*</field>
-        <field name="type">payable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_income_view"/>
         <field name="user_type" ref="account.account_type_tax"/>
@@ -64,7 +64,7 @@
     <record model="account.account" id="auction_expense_costs">
         <field name="name">Auction Seller Costs</field>
         <field name="code">A9x*</field>
-        <field name="type">receivable</field>
+        <field name="type">other</field>
         <field name="currency_id" search="[('name','=','EUR')]"/>
         <field name="parent_id" eval="auction_expense_view"/>
         <field name="user_type" ref="account.account_type_tax"/>
diff --git a/addons/stock/test/stock_test.yml b/addons/stock/test/stock_test.yml
index 48153ee732c..6a82846492d 100644
--- a/addons/stock/test/stock_test.yml
+++ b/addons/stock/test/stock_test.yml
@@ -3,51 +3,6 @@
   In order to test the stock module, I will create product,
   create physical inventory ,fill inventory lines from location,split inventory line into production lot
 
--
-  I create Asset Account Type.
--
-  !record {model: account.account.type, id: account_account_type_asset0}:
-    close_method: balance
-    code: asset
-    name: Asset
-    sign: 1
-
--
-   I create Income Account Type.
--
-  !record {model: account.account.type, id: account_account_type_income0}:
-    close_method: unreconciled
-    code: income
-    name: Income
-    sign: 1
-
-
--
-  I create Expense Account Type.
--
-  !record {model: account.account.type, id: account_account_type_expense0}:
-    close_method: unreconciled
-    code: expense
-    name: Expense
-    sign: 1
--
-  I create Cash Account Type.
--
-  !record {model: account.account.type, id: account_account_type_cash0}:
-    close_method: balance
-    code: cash
-    name: Cash
-    sign: 1
-
-
--
-  I create Receivable Account Type.
--
-  !record {model: account.account.type, id: account_account_type_receivable0}:
-    close_method: balance
-    code: receivable
-    name: Receivable
-    sign: 1
 -
 
   I create Receivable Account .
@@ -60,7 +15,7 @@
     parent_left: 1
     parent_right: 2
     type: receivable
-    user_type: account_account_type_receivable0
+    user_type: account.account_type_receivable
 -
   I create Payable Account.
 -
@@ -72,7 +27,7 @@
     parent_left: 3
     parent_right: 4
     type: payable
-    user_type: account_account_type_expense0
+    user_type: account.account_type_payable
 -
   I create Purchase Journal - (test).
 -
@@ -106,7 +61,7 @@
     parent_left: 5
     parent_right: 6
     type: consolidation
-    user_type: account_account_type_asset0
+    user_type: account.account_type_expense
 -
   I create Product Sale Account.
 -
@@ -116,7 +71,7 @@
     currency_mode: current
     name: Product Sale
     type: other
-    user_type: stock.account_account_type_income0
+    user_type: account.account_type_income
 
 
 -
@@ -128,7 +83,7 @@
     currency_mode: current
     name: Product Purchase
     type: other
-    user_type: account_account_type_expense0
+    user_type: account.account_type_expense
 
 -
   I create partner.