diff --git a/setup.py b/setup.py
index 10fe65c8a6..013b8f0929 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ import io
 import os
 import re
 from configparser import ConfigParser
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 def read(fname):
@@ -68,10 +68,10 @@ setup(name=name,
     download_url=download_url,
     keywords='tryton sale payment',
     package_dir={'trytond.modules.sale_payment': '.'},
-    packages=[
-        'trytond.modules.sale_payment',
-        'trytond.modules.sale_payment.tests',
-        ],
+    packages=(
+        ['trytond.modules.sale_payment'] +
+        ['trytond.modules.sale_payment.%s' % p for p in find_packages()]
+        ),
     package_data={
         'trytond.modules.sale_payment': (info.get('xml', [])
             + ['tryton.cfg', 'view/*.xml', 'locale/*.po', '*.fodt',