diff --git a/tests/__init__.py b/tests/__init__.py
index 86beac9..e69de29 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,5 +0,0 @@
-# The COPYRIGHT file at the top level of this repository contains the full
-# copyright notices and license terms.
-from .test_account_invoice_intercompany import suite
-
-__all__ = ['suite']
diff --git a/tests/test_account_invoice_intercompany.py b/tests/test_account_invoice_intercompany.py
deleted file mode 100644
index 4ff779f..0000000
--- a/tests/test_account_invoice_intercompany.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# The COPYRIGHT file at the top level of this repository contains the full
-# copyright notices and license terms.
-import unittest
-import trytond.tests.test_tryton
-from trytond.tests.test_tryton import ModuleTestCase
-
-
-class AccountInvoiceIntercomanyTestCase(ModuleTestCase):
-    'Test Account Invoice Intercompany'
-    module = 'account_invoice_intercompany'
-
-
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-        AccountInvoiceIntercomanyTestCase))
-#    Scenario works until post invoice, proteus didn't like to change contex
-#    and company.
-#    suite.addTests(doctest.DocFileSuite('scenario_invoice_intercompany.rst',
-#            setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
-#            checker=doctest_checker,
-#            optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
-    return suite
diff --git a/tests/test_module.py b/tests/test_module.py
new file mode 100644
index 0000000..d45b920
--- /dev/null
+++ b/tests/test_module.py
@@ -0,0 +1,14 @@
+
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+from trytond.modules.company.tests import CompanyTestMixin
+from trytond.tests.test_tryton import ModuleTestCase
+
+
+class AccountInvoiceIntercompanyTestCase(CompanyTestMixin, ModuleTestCase):
+    'Test AccountInvoiceIntercompany module'
+    module = 'account_invoice_intercompany'
+
+
+del ModuleTestCase
diff --git a/tests/test_scenario.py b/tests/test_scenario.py
new file mode 100644
index 0000000..b5e24ad
--- /dev/null
+++ b/tests/test_scenario.py
@@ -0,0 +1,23 @@
+
+# This file is part of Tryton.  The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+import doctest
+import glob
+import os
+
+from trytond.tests.test_tryton import doctest_checker, doctest_teardown
+
+
+def load_tests(loader, tests, pattern):
+    cwd = os.getcwd()
+    try:
+        os.chdir(os.path.dirname(__file__))
+        for scenario in glob.glob('*.rst'):
+            tests.addTests(doctest.DocFileSuite(
+                    scenario, tearDown=doctest_teardown, encoding='utf-8',
+                    checker=doctest_checker,
+                    optionflags=doctest.REPORT_ONLY_FIRST_FAILURE))
+    finally:
+        os.chdir(cwd)
+    return tests
\ No newline at end of file