diff --git a/setup.py b/setup.py
index 41e2a89dc2..761dd287a2 100644
--- a/setup.py
+++ b/setup.py
@@ -30,6 +30,7 @@ setup(name='trytond_timesheet',
     package_dir={'trytond.modules.timesheet': '.'},
     packages=[
         'trytond.modules.timesheet',
+        'trytond.modules.timesheet.tests',
     ],
     package_data={
         'trytond.modules.timesheet': info.get('xml', []) \
@@ -56,4 +57,6 @@ setup(name='trytond_timesheet',
     [trytond.modules]
     timesheet = trytond.modules.timesheet
     """,
+    test_suite='tests',
+    test_loader='trytond.test_loader:Loader',
 )
diff --git a/tests/__init__.py b/tests/__init__.py
index d8bc8484dd..25f36425b9 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
 #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 test_timesheet import *
+from test_timesheet import suite
diff --git a/tests/test_timesheet.py b/tests/test_timesheet.py
index 4aa6ac61e3..a4f57aae81 100644
--- a/tests/test_timesheet.py
+++ b/tests/test_timesheet.py
@@ -2,9 +2,6 @@
 #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 logging
-logging.basicConfig(level=logging.FATAL)
-
 import sys, os
 DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
     '..', '..', '..', '..', '..', 'trytond')))