diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index 142ec03bd7c..6d29053b93c 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -5,26 +5,11 @@ import test_orm
 import test_ir_sequence
 import test_xmlrpc
 
-# This test suite assumes a database.
-def make_suite():
-    suite = unittest2.TestSuite()
-    suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_ir_sequence))
-    suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_orm))
-    return suite
-
-# This test suite creates a database.
-def make_suite_no_db():
-    suite = unittest2.TestSuite()
-    suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_xmlrpc))
-    return suite
-
-# This test suite combines the two above test suites
-# (and thus creates a database).
-def make_complete_suite():
-    suite = unittest2.TestSuite()
-    suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_xmlrpc))
-    suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_ir_sequence))
-    suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_orm))
-    return suite
+# Explicit declaration list of test sub-modules.
+suite = [
+    test_xmlrpc, # Creates a database
+    test_ir_sequence, # Assume an existing database
+    test_orm, # Assume an existing database
+    ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: