diff --git a/addons/survey/test/survey_test.py b/addons/survey/test/__init__.py
similarity index 90%
rename from addons/survey/test/survey_test.py
rename to addons/survey/test/__init__.py
index ea9001a2421..b2a1a5accf2 100644
--- a/addons/survey/test/survey_test.py
+++ b/addons/survey/test/__init__.py
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-#from openerp.osv.orm import except_orm
-#from openerp.tools import mute_logger
 
+from . import test_survey
 
-class test_survey():
-    pass
+checks = [
+    test_survey
+]
diff --git a/addons/survey/test/test_survey.py b/addons/survey/test/test_survey.py
new file mode 100644
index 00000000000..c3a3f4459af
--- /dev/null
+++ b/addons/survey/test/test_survey.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2014-TODAY OpenERP S.A. <http://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 openerp.tests import common
+
+
+class test_survey(common.TransactionCase):
+
+    def setUp(self):
+        super(test_survey, self).setUp()
+        cr, uid, context = self.cr, self.uid, {}
+        pass
+
+    def test_00_create_survey_and_questions(self):
+        cr, uid, context = self.cr, self.uid, {}
+        pass
+
+    def test_01_fill_survey(self):
+        pass
+
+    def test_02_answer_survey(self):
+        pass