diff --git a/openerp/test/__init__.py b/openerp/test/__init__.py
deleted file mode 100644
index 7a6c167d85b..00000000000
--- a/openerp/test/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP S.A. http://www.openerp.com
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from test_osv import *
-from test_translate import *
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index d036ccfc751..92a40ab306c 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -8,9 +8,10 @@ Tests can be explicitely added to the `fast_suite` or `checks` lists or not.
 See the :ref:`test-framework` section in the :ref:`features` list.
 """
 
-from . import test_expression, test_mail, test_ir_sequence, test_orm,\
+from . import test_expression, test_mail, test_ir_sequence, test_orm, \
               test_fields, test_basecase, \
-              test_view_validation, test_uninstall, test_misc, test_db_cursor
+              test_view_validation, test_uninstall, test_misc, test_db_cursor, \
+              test_osv, test_translate
 from . import test_ir_filters
 
 fast_suite = [
@@ -27,6 +28,8 @@ checks = [
     test_basecase,
     test_view_validation,
     test_misc,
+    test_osv,
+    test_translate,
 ]
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/test/test_osv.py b/openerp/tests/test_osv.py
similarity index 62%
rename from openerp/test/test_osv.py
rename to openerp/tests/test_osv.py
index 2db9cec1cbd..80be8160b61 100644
--- a/openerp/test/test_osv.py
+++ b/openerp/tests/test_osv.py
@@ -22,45 +22,45 @@
 import unittest
 from openerp.osv.query import Query
 
+
 class QueryTestCase(unittest.TestCase):
 
     def test_basic_query(self):
         query = Query()
-        query.tables.extend(['"product_product"','"product_template"'])
+        query.tables.extend(['"product_product"', '"product_template"'])
         query.where_clause.append("product_product.template_id = product_template.id")
-        query.add_join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
-        query.add_join(("product_product", "res_user", "user_id", "id"), outer=True) # outer join
+        query.add_join(("product_template", "product_category", "categ_id", "id"), outer=False)  # add normal join
+        query.add_join(("product_product", "res_user", "user_id", "id"), outer=True)  # outer join
         self.assertEquals(query.get_sql()[0].strip(),
-            """"product_product" LEFT JOIN "res_user" ON ("product_product"."user_id" = "res_user"."id"),"product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") """.strip())
+            """"product_product" LEFT JOIN "res_user" as "product_product__user_id" ON ("product_product"."user_id" = "product_product__user_id"."id"),"product_template" JOIN "product_category" as "product_template__categ_id" ON ("product_template"."categ_id" = "product_template__categ_id"."id") """.strip())
         self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
 
     def test_query_chained_explicit_joins(self):
         query = Query()
-        query.tables.extend(['"product_product"','"product_template"'])
+        query.tables.extend(['"product_product"', '"product_template"'])
         query.where_clause.append("product_product.template_id = product_template.id")
-        query.add_join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
-        query.add_join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
+        query.add_join(("product_template", "product_category", "categ_id", "id"), outer=False)  # add normal join
+        query.add_join(("product_template__categ_id", "res_user", "user_id", "id"), outer=True)  # CHAINED outer join
         self.assertEquals(query.get_sql()[0].strip(),
-            """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id")""".strip())
+            """"product_product","product_template" JOIN "product_category" as "product_template__categ_id" ON ("product_template"."categ_id" = "product_template__categ_id"."id") LEFT JOIN "res_user" as "product_template__categ_id__user_id" ON ("product_template__categ_id"."user_id" = "product_template__categ_id__user_id"."id")""".strip())
         self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id""".strip())
 
     def test_mixed_query_chained_explicit_implicit_joins(self):
         query = Query()
-        query.tables.extend(['"product_product"','"product_template"'])
+        query.tables.extend(['"product_product"', '"product_template"'])
         query.where_clause.append("product_product.template_id = product_template.id")
-        query.add_join(("product_template", "product_category", "categ_id", "id"), outer=False) # add normal join
-        query.add_join(("product_category", "res_user", "user_id", "id"), outer=True) # CHAINED outer join
+        query.add_join(("product_template", "product_category", "categ_id", "id"), outer=False)  # add normal join
+        query.add_join(("product_template__categ_id", "res_user", "user_id", "id"), outer=True)  # CHAINED outer join
         query.tables.append('"account.account"')
-        query.where_clause.append("product_category.expense_account_id = account_account.id") # additional implicit join
+        query.where_clause.append("product_category.expense_account_id = account_account.id")  # additional implicit join
         self.assertEquals(query.get_sql()[0].strip(),
-            """"product_product","product_template" JOIN "product_category" ON ("product_template"."categ_id" = "product_category"."id") LEFT JOIN "res_user" ON ("product_category"."user_id" = "res_user"."id"),"account.account" """.strip())
+            """"product_product","product_template" JOIN "product_category" as "product_template__categ_id" ON ("product_template"."categ_id" = "product_template__categ_id"."id") LEFT JOIN "res_user" as "product_template__categ_id__user_id" ON ("product_template__categ_id"."user_id" = "product_template__categ_id__user_id"."id"),"account.account" """.strip())
         self.assertEquals(query.get_sql()[1].strip(), """product_product.template_id = product_template.id AND product_category.expense_account_id = account_account.id""".strip())
 
-
     def test_raise_missing_lhs(self):
         query = Query()
         query.tables.append('"product_product"')
-        self.assertRaises(AssertionError, query.join, ("product_template", "product_category", "categ_id", "id"), outer=False)
+        self.assertRaises(AssertionError, query.add_join, ("product_template", "product_category", "categ_id", "id"), outer=False)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/test/test_translate.py b/openerp/tests/test_translate.py
similarity index 100%
rename from openerp/test/test_translate.py
rename to openerp/tests/test_translate.py