diff --git a/tests/__init__.py b/tests/__init__.py
index 61f0720..e69de29 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,9 +0,0 @@
-# The COPYRIGHT file at the top level of this repository contains the full
-# copyright notices and license terms.
-try:
-    from trytond.modules.analytic_invoice_balance.tests\
-        .test_account_invoice_facturae import suite
-except ImportError:
-    from .test_account_invoice_facturae import suite
-
-__all__ = ['suite']
diff --git a/tests/test_account_invoice_facturae.py b/tests/test_module.py
similarity index 94%
rename from tests/test_account_invoice_facturae.py
rename to tests/test_module.py
index b3f997c..074d999 100644
--- a/tests/test_account_invoice_facturae.py
+++ b/tests/test_module.py
@@ -1,22 +1,21 @@
-# The COPYRIGHT file at the top level of this repository contains the full
-# copyright notices and license terms.
-# import doctest
+
+# 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 os.path
-import unittest
 from decimal import Decimal
-import trytond.tests.test_tryton
 from trytond.pool import Pool
 from trytond.transaction import Transaction
 from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 from trytond.modules.account.tests import get_fiscalyear, create_chart
-from trytond.modules.company.tests import create_company, set_company
+from trytond.modules.company.tests import create_company, set_company, CompanyTestMixin
 from trytond.modules.account_invoice.tests import set_invoice_sequences
 from trytond.modules.currency.tests import create_currency, add_currency_rate
 CURRENT_PATH = os.path.dirname(os.path.abspath(__file__))
 
 
-class TestAccountInvoiceFacturaeCase(ModuleTestCase):
-    'Test account_invoice_facturae module'
+class AccountInvoiceFacturaeTestCase(CompanyTestMixin, ModuleTestCase):
+    'Test AccountInvoiceFacturae module'
     module = 'account_invoice_facturae'
 
     @with_transaction()
@@ -204,8 +203,5 @@ class TestAccountInvoiceFacturaeCase(ModuleTestCase):
             self.assertNotEqual(invoice.invoice_facturae, None)
             self.assertEqual(invoice.invoice_facturae_filename, 'facturae-1.xsig')
 
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-            TestAccountInvoiceFacturaeCase))
-    return suite
+
+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