diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 2fde404bf12..6e025ae2d90 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -77,7 +77,6 @@ Dashboard / Reports for MRP will include:
     #TODO: This yml tests are needed to be completely reviewed again because the product wood panel is removed in product demo as it does not suit for new demo context of computer and consultant company
     # so the ymls are too complex to change at this stage
     'test': [
-        'test/multicompany.yml',
 #         'test/order_demo.yml',
 #         'test/order_process.yml',
 #         'test/cancel_order.yml',
diff --git a/addons/mrp/test/multicompany.yml b/addons/mrp/test/multicompany.yml
deleted file mode 100644
index 7ed9cf86023..00000000000
--- a/addons/mrp/test/multicompany.yml
+++ /dev/null
@@ -1,20 +0,0 @@
--
-  Set the current user as multicompany user
--
-  !context
-    uid: 'stock.multicompany_user'
-
--
-  check no error on getting default mrp.production values in multicompany setting
--
-  !python {model: mrp.production}: |
-    location_obj = self.pool.get('stock.location')
-    fields = ['location_src_id', 'location_dest_id']
-    defaults = self.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context)
-    log('got defaults: %s', defaults)
-    for field in fields:
-        if defaults.get(field):
-            try:
-                location_obj.check_access_rule(cr, uid, [defaults[field]], 'read', context)
-            except Exception, exc:
-                assert False, "unreadable location %s: %s" % (field, exc)
diff --git a/addons/mrp/tests/__init__.py b/addons/mrp/tests/__init__.py
new file mode 100644
index 00000000000..39ebd5e451f
--- /dev/null
+++ b/addons/mrp/tests/__init__.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from . import test_multicompany
+
+checks = [
+    test_multicompany,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/tests/test_multicompany.py b/addons/mrp/tests/test_multicompany.py
new file mode 100644
index 00000000000..78986bd41b2
--- /dev/null
+++ b/addons/mrp/tests/test_multicompany.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+
+class TestMrpMulticompany(common.TransactionCase):
+
+    def setUp(self):
+        super(TestMrpMulticompany, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        # Usefull models
+        self.ir_model_data = self.registry('ir.model.data')
+        self.res_users = self.registry('res.users')
+        self.stock_location = self.registry('stock.location')
+
+        model, self.multicompany_user_id = self.ir_model_data.get_object_reference(cr, uid, 'stock', 'multicompany_user')
+
+
+    def test_00_multicompany_user(self):
+        """check no error on getting default mrp.production values in multicompany setting"""
+        cr, uid, context = self.cr, self.multicompany_user_id, {}
+        fields = ['location_src_id', 'location_dest_id']
+        defaults = self.stock_location.default_get(cr, uid, ['location_id', 'location_dest_id', 'type'], context)
+        for field in fields:
+            print field, uid, defaults
+            if defaults.get(field):
+                try:
+                    self.stock_location.check_access_rule(cr, uid, [defaults[field]], 'read', context)
+                except Exception, exc:
+                    assert False, "unreadable location %s: %s" % (field, exc)