diff --git a/tests/__init__.py b/tests/__init__.py
index f4f1951..e69de29 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,8 +0,0 @@
-# The COPYRIGHT file at the top level of this repository contains the full
-# copyright notices and license terms.
-try:
-    from trytond.modules.purchase_supplier_discount.tests.test_purchase_supplier_discount import suite
-except ImportError:
-    from .test_purchase_supplier_discount import suite
-
-__all__ = ['suite']
diff --git a/tests/test_purchase_supplier_discount.py b/tests/test_module.py
similarity index 93%
rename from tests/test_purchase_supplier_discount.py
rename to tests/test_module.py
index d8c89c0..7b65e4e 100644
--- a/tests/test_purchase_supplier_discount.py
+++ b/tests/test_module.py
@@ -1,13 +1,13 @@
-# The COPYRIGHT file at the top level of this repository contains the full
-# copyright notices and license terms.
-import unittest
+
+# 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 datetime
 from decimal import Decimal
 
-import trytond.tests.test_tryton
 from trytond.tests.test_tryton import ModuleTestCase, with_transaction
 from trytond.pool import Pool
-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.tests import create_chart
 
 
@@ -85,8 +85,8 @@ def create_supplier(company):
     return supplier1, supplier2, product, product_supplier1, product_supplier2
 
 
-class PurchaseSupplierDiscountTestCase(ModuleTestCase):
-    'Test Purchase Supplier Discount module'
+class PurchaseSupplierDiscountTestCase(CompanyTestMixin, ModuleTestCase):
+    'Test PurchaseSupplierDiscount module'
     module = 'purchase_supplier_discount'
 
     @with_transaction()
@@ -194,8 +194,4 @@ class PurchaseSupplierDiscountTestCase(ModuleTestCase):
             self.assertEqual(line3.discount, Decimal('0.20'))
 
 
-def suite():
-    suite = trytond.tests.test_tryton.suite()
-    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
-        PurchaseSupplierDiscountTestCase))
-    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