diff --git a/addons/survey/controllers/main.py b/addons/survey/controllers/main.py
index 379359086b6..65e4cd370fc 100644
--- a/addons/survey/controllers/main.py
+++ b/addons/survey/controllers/main.py
@@ -15,7 +15,6 @@ _logger = logging.getLogger(__name__)
 
 
 class Survey(http.Controller):
-    # HELPER METHODS #
 
     def _check_bad_cases(self, survey, token=None):
         # In case of bad survey, redirect to surveys list
@@ -49,23 +48,27 @@ class Survey(http.Controller):
                 return request.render("survey.notopen")
         return None
 
-    ## ROUTES HANDLERS ##
+    @http.route('/survey/test/<model("survey.survey"):survey>', type='http', auth='user', website=True)
+    def survey_test(self, survey, token=None):
+        """ Test mode for surveys: create a test answer, only for managers or officers
+        testing their surveys """
+        if request.env.user.has_group('survey.group_survey_manager') or \
+                request.env.user.has_group('survey.group_survey_user') and survey.create_uid == request.env.user:
+            user_input = request.env['survey.user_input'].create({
+                'survey_id': survey.id,
+                'test_entry': True
+            })
+            return request.redirect('/survey/start/%s/%s' % survey.id, user_input.token)
+        return werkzeug.utils.redirect('/')
 
-    # Survey start
     @http.route(['/survey/start/<model("survey.survey"):survey>',
                  '/survey/start/<model("survey.survey"):survey>/<string:token>'],
                 type='http', auth='public', website=True)
-    def start_survey(self, survey, token=None, **post):
+    def survey_start(self, survey, token=None, **post):
+        """ Start a survey by providing a token linked to an answer or generate
+        a new token if access is allowed """
         UserInput = request.env['survey.user_input']
 
-        # Test mode
-        if token and token == "phantom":
-            _logger.info("[survey] Phantom mode")
-            user_input = UserInput.create({'survey_id': survey.id, 'test_entry': True})
-            data = {'survey': survey, 'page': None, 'token': user_input.token}
-            return request.render('survey.survey_init', data)
-        # END Test mode
-
         # Controls if the survey can be displayed
         errpage = self._check_bad_cases(survey, token=token)
         if errpage:
diff --git a/addons/survey/models/survey_survey.py b/addons/survey/models/survey_survey.py
index b78f947aeef..01e0b7b8eec 100644
--- a/addons/survey/models/survey_survey.py
+++ b/addons/survey/models/survey_survey.py
@@ -337,9 +337,9 @@ class Survey(models.Model):
         self.ensure_one()
         return {
             'type': 'ir.actions.act_url',
-            'name': "Results of the Survey",
+            'name': "Test Survey",
             'target': 'self',
-            'url': self.with_context(relative_url=True).public_url + "/phantom"
+            'url': '/survey/test/%s' % self.id,
         }
 
     @api.multi
@@ -351,4 +351,3 @@ class Survey(models.Model):
                     'search_default_completed': 1})
         action['context'] = ctx
         return action
-
diff --git a/addons/survey/static/src/js/tour_test_survey.js b/addons/survey/static/src/js/tour_test_survey.js
index c051c766ba0..9a9cac10001 100644
--- a/addons/survey/static/src/js/tour_test_survey.js
+++ b/addons/survey/static/src/js/tour_test_survey.js
@@ -6,7 +6,7 @@ var base = require("web_editor.base");
 
 tour.register('test_survey', {
     test: true,
-    url: '/survey/start/user-feedback-form-1',
+    url: '/survey/start/1',
     wait_for: base.ready()
 }, [
     // Page-1