diff --git a/addons/project/data/project_demo.xml b/addons/project/data/project_demo.xml
index aaa602f29aa..9061b168c98 100644
--- a/addons/project/data/project_demo.xml
+++ b/addons/project/data/project_demo.xml
@@ -7,9 +7,10 @@
             <field name="groups_id" eval="[(4, ref('group_project_manager'))]"/>
         </record>
 
-        <!-- Groups : Add subtasks and recurring tasks by default -->
+        <!-- Groups : Add subtasks, recurring tasks and task dependencies by default -->
         <record id="base.group_user" model="res.groups">
-            <field name="implied_ids" eval="[(4, ref('group_subtask_project')), (4, ref('group_project_recurring_tasks'))]"/>
+            <field name="implied_ids"
+                   eval="[(4, ref('group_subtask_project')), (4, ref('group_project_recurring_tasks')), (4, ref('group_project_task_dependencies'))]"/>
         </record>
 
         <!-- Categories -->
@@ -398,6 +399,47 @@
             <field name="mail_message_id" ref="project_task_7_mail_message_1"/>
         </record>
 
+        <record id="project_task_22" model="project.task">
+            <field name="planned_hours">12.0</field>
+            <field name="stage_id" ref="project_stage_1"/>
+            <field name="user_ids" eval="[(4, ref('base.user_admin')), (4, ref('base.user_demo'))]"/>
+            <field name="priority">0</field>
+            <field name="project_id" ref="project.project_project_2"/>
+            <field name="name">Customer analysis + Architecture</field>
+            <field name="color">7</field>
+            <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+        </record>
+        <record id="project_task_22_mail_message_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project.project_task_22"/>
+            <field name="message_type">notification</field>
+            <field name="subtype_id" ref="mt_task_stage"/>
+            <field name="date" eval="DateTime.now() - relativedelta(months=2)"/>
+            <field name="author_id" ref="base.partner_admin"/>
+        </record>
+        <record id="project_task_22_mail_message_1_track_1" model="mail.tracking.value">
+            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
+            <field name="field_desc">Stage</field>
+            <field name="old_value_char">New</field>
+            <field name="new_value_char">In Progress</field>
+            <field name="field_type">many2one</field>
+            <field name="old_value_integer">1</field>
+            <field name="new_value_integer">2</field>
+            <field name="mail_message_id" ref="project_task_22_mail_message_1"/>
+        </record>
+
+        <record id="project_task_12" model="project.task">
+            <field name="planned_hours" eval="40.0"/>
+            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="priority">1</field>
+            <field name="project_id" ref="project.project_project_2"/>
+            <field name="name">Planning and budget</field>
+            <field name="stage_id" ref="project_stage_0"/>
+            <field name="color">6</field>
+            <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids" eval="[(4, ref('project.project_task_22'))]"/>
+        </record>
+
         <record id="project_task_8" model="project.task">
             <field name="planned_hours" eval="22.0"/>
             <field name="user_ids" eval="[(4, ref('base.user_demo'))]"/>
@@ -409,6 +451,7 @@
             <field name="tag_ids" eval="[(6, 0, [
                     ref('project.project_tags_02')])]"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids" eval="[(4, ref('project.project_task_12'))]"/>
         </record>
         <record id="project_task_8_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
@@ -447,15 +490,6 @@
             <field name="mail_message_id" ref="project_task_8_mail_message_2"/>
         </record>
 
-        <record id="project_task_9" model="project.task">
-            <field name="planned_hours" eval="18.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_demo'))]"/>
-            <field name="priority">1</field>
-            <field name="project_id" ref="project.project_project_2"/>
-            <field name="name">Document management</field>
-            <field name="stage_id" ref="project_stage_0"/>
-            <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-        </record>
         <record id="project_task_10" model="project.task">
             <field name="planned_hours" eval="38.0"/>
             <field name="user_ids" eval="[(4, ref('base.user_demo'))]"/>
@@ -465,6 +499,7 @@
             <field name="kanban_state">blocked</field>
             <field name="stage_id" ref="project_stage_1"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids" eval="[(4, ref('project.project_task_12'))]"/>
         </record>
         <record id="project_task_10_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
@@ -496,6 +531,7 @@
                     ref('project.project_tags_03')])]"/>
             <field name="stage_id" ref="project_stage_1"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids" eval="[(4, ref('project.project_task_12'))]"/>
         </record>
         <record id="project_task_11_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
@@ -516,64 +552,6 @@
             <field name="mail_message_id" ref="project_task_11_mail_message_1"/>
         </record>
 
-        <record id="project_task_12" model="project.task">
-            <field name="planned_hours" eval="40.0"/>
-            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
-            <field name="priority">1</field>
-            <field name="project_id" ref="project.project_project_2"/>
-            <field name="name">Planning and budget</field>
-            <field name="stage_id" ref="project_stage_0"/>
-            <field name="color">6</field>
-            <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-        </record>
-
-        <record id="project_task_19" model="project.task">
-            <field name="planned_hours">24.0</field>
-            <field name="stage_id" ref="project_stage_3"/>
-            <field name="user_ids" eval="False"/>
-            <field name="project_id" ref="project.project_project_2"/>
-            <field name="name">Basic outline</field>
-            <field name="tag_ids" eval="[(6, 0, [
-                    ref('project_tags_02')])]"/>
-            <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
-        </record>
-        <record id="project_task_19_mail_message_1" model="mail.message">
-            <field name="model">project.task</field>
-            <field name="res_id" ref="project.project_task_19"/>
-            <field name="message_type">notification</field>
-            <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=4)"/>
-            <field name="author_id" ref="base.partner_admin"/>
-        </record>
-        <record id="project_task_19_mail_message_2" model="mail.message">
-            <field name="model">project.task</field>
-            <field name="res_id" ref="project.project_task_19"/>
-            <field name="message_type">notification</field>
-            <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=4, days=10)"/>
-            <field name="author_id" ref="base.partner_admin"/>
-        </record>
-        <record id="project_task_19_mail_message_1_track_1" model="mail.tracking.value">
-            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
-            <field name="field_desc">Stage</field>
-            <field name="old_value_char">New</field>
-            <field name="new_value_char">In Progress</field>
-            <field name="field_type">many2one</field>
-            <field name="old_value_integer">1</field>
-            <field name="new_value_integer">2</field>
-            <field name="mail_message_id" ref="project_task_19_mail_message_1"/>
-        </record>
-        <record id="project_task_19_mail_message_2_track_1" model="mail.tracking.value">
-            <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
-            <field name="field_desc">Stage</field>
-            <field name="old_value_char">In Progress</field>
-            <field name="new_value_char">Cancelled</field>
-            <field name="field_type">many2one</field>
-            <field name="old_value_integer">2</field>
-            <field name="new_value_integer">4</field>
-            <field name="mail_message_id" ref="project_task_19_mail_message_2"/>
-        </record>
-
         <record id="project_task_20" model="project.task">
             <field name="planned_hours">42.0</field>
             <field name="user_ids" eval="False"/>
@@ -581,17 +559,20 @@
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Create new components</field>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids" eval="[(4, ref('project.project_task_12'))]"/>
         </record>
 
         <record id="project_task_21" model="project.task">
             <field name="planned_hours">14.0</field>
-            <field name="user_ids" eval="False"/>
+            <field name="user_ids" eval="[(4, ref('base.user_admin')), (4, ref('base.user_demo'))]"/>
             <field name="stage_id" ref="project_stage_1"/>
             <field name="project_id" ref="project.project_project_2"/>
-            <field name="name">Useablity review</field>
+            <field name="name">Usability review</field>
             <field name="tag_ids" eval="[(6, 0, [
                     ref('project_tags_03')])]"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids"
+                   eval="[(4, ref('project.project_task_8')), (4, ref('project.project_task_10')), (4, ref('project.project_task_11')), (4, ref('project.project_task_20'))]"/>
         </record>
         <record id="project_task_21_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
@@ -612,25 +593,37 @@
             <field name="mail_message_id" ref="project_task_21_mail_message_1"/>
         </record>
 
-        <record id="project_task_22" model="project.task">
-            <field name="planned_hours">12.0</field>
-            <field name="stage_id" ref="project_stage_1"/>
-            <field name="user_ids" eval="False"/>
-            <field name="priority">0</field>
+        <record id="project_task_9" model="project.task">
+            <field name="planned_hours" eval="18.0"/>
+            <field name="user_ids" eval="[(4, ref('base.user_admin')), (4, ref('base.user_demo'))]"/>
+            <field name="priority">1</field>
             <field name="project_id" ref="project.project_project_2"/>
-            <field name="name">Customer analysis + Architecture</field>
-            <field name="color">7</field>
+            <field name="name">Document management</field>
+            <field name="stage_id" ref="project_stage_0"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids" eval="[(4, ref('project.project_task_21'))]"/>
         </record>
-        <record id="project_task_22_mail_message_1" model="mail.message">
+
+        <record id="project_task_19" model="project.task">
+            <field name="planned_hours">24.0</field>
+            <field name="stage_id" ref="project_stage_1"/>
+            <field name="user_ids" eval="[(4, ref('base.user_admin'))]"/>
+            <field name="project_id" ref="project.project_project_2"/>
+            <field name="name">Basic outline</field>
+            <field name="tag_ids" eval="[(6, 0, [
+                    ref('project_tags_02')])]"/>
+            <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids" eval="[(4, ref('project.project_task_22'))]"/>
+        </record>
+        <record id="project_task_19_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
-            <field name="res_id" ref="project.project_task_22"/>
+            <field name="res_id" ref="project.project_task_19"/>
             <field name="message_type">notification</field>
             <field name="subtype_id" ref="mt_task_stage"/>
-            <field name="date" eval="DateTime.now() - relativedelta(months=2)"/>
+            <field name="date" eval="DateTime.now() - relativedelta(months=4)"/>
             <field name="author_id" ref="base.partner_admin"/>
         </record>
-        <record id="project_task_22_mail_message_1_track_1" model="mail.tracking.value">
+        <record id="project_task_19_mail_message_1_track_1" model="mail.tracking.value">
             <field name="field" model="ir.model.fields" eval="obj().search([('model', '=', 'project.task'), ('name', '=', 'stage_id')])"/>
             <field name="field_desc">Stage</field>
             <field name="old_value_char">New</field>
@@ -638,7 +631,7 @@
             <field name="field_type">many2one</field>
             <field name="old_value_integer">1</field>
             <field name="new_value_integer">2</field>
-            <field name="mail_message_id" ref="project_task_22_mail_message_1"/>
+            <field name="mail_message_id" ref="project_task_19_mail_message_1"/>
         </record>
 
         <record id="project_task_24" model="project.task">
@@ -708,6 +701,7 @@
             <field name="name">Unit Testing</field>
             <field name="stage_id" ref="project_stage_2"/>
             <field name="create_date" eval="DateTime.now() - relativedelta(months=5)"/>
+            <field name="depend_on_ids" eval="[(4, ref('project.project_task_21'))]"/>
         </record>
         <record id="project_task_26_mail_message_1" model="mail.message">
             <field name="model">project.task</field>
diff --git a/addons/project/tests/test_task_dependencies.py b/addons/project/tests/test_task_dependencies.py
index 48d0e694d86..984f28bbfbc 100644
--- a/addons/project/tests/test_task_dependencies.py
+++ b/addons/project/tests/test_task_dependencies.py
@@ -140,6 +140,10 @@ class TestTaskDependencies(TestProjectCommon):
             'allow_task_dependencies': False,
         })
 
+        # As the the Project General Setting group_project_task_dependencies needs to be toggled in order
+        # to be applied on the existing projects we need to force it so that it does not depends on anything
+        # (like demo data for instance)
+        set_task_dependencies_setting(False)
         set_task_dependencies_setting(True)
         self.assertTrue(self.project_pigs.allow_task_dependencies, "Projects allow_task_dependencies should follow group_project_task_dependencies setting changes")