diff --git a/planemo/training/tutorial.py b/planemo/training/tutorial.py
index f2a2448a9..90fd3f3eb 100644
--- a/planemo/training/tutorial.py
+++ b/planemo/training/tutorial.py
@@ -135,9 +135,6 @@
 """
 
 TUTO_HAND_ON_BODY_TEMPLATE = """
-# Introduction
-
-<!-- This is a comment. -->
 
 General introduction about the topic and then an introduction of the
 tutorial (the questions and the objectives). It is nice also to have a
@@ -157,6 +154,7 @@
 [bibliography section](#bibliography) which will automatically be created at the end of the
 tutorial.
 
+<!-- This is a comment. -->
 
 **Please follow our
 [tutorial to learn how to fill the Markdown]({{ '{{' }} site.baseurl {{ '}}' }}/topics/contributing/tutorials/\
diff --git a/tests/data/training_tutorial.md b/tests/data/training_tutorial.md
index f0855ce2e..de9f12358 100644
--- a/tests/data/training_tutorial.md
+++ b/tests/data/training_tutorial.md
@@ -16,12 +16,9 @@ contributors:
   - the_best_contributor
 ---
 
-# Introduction
-{:.no_toc}
-
 The introduction
 
-> ### Agenda
+> <agenda-title></agenda-title>
 >
 > In this tutorial, we will deal with:
 >
@@ -32,4 +29,4 @@ The introduction
 
 # First section
 
-# Second section
\ No newline at end of file
+# Second section
diff --git a/tests/data/training_tutorial_wo_zenodo.md b/tests/data/training_tutorial_wo_zenodo.md
index 40c1b5df6..f51473a69 100644
--- a/tests/data/training_tutorial_wo_zenodo.md
+++ b/tests/data/training_tutorial_wo_zenodo.md
@@ -16,12 +16,9 @@ contributors:
   - the_best_contributor
 ---
 
-# Introduction
-{:.no_toc}
-
 The introduction
 
-> ### Agenda
+> <agenda-title></agenda-title>
 >
 > In this tutorial, we will deal with:
 >
@@ -32,4 +29,4 @@ The introduction
 
 # First section
 
-# Second section
\ No newline at end of file
+# Second section
diff --git a/tests/data/tutorial.md b/tests/data/tutorial.md
index 96553f63f..29c5ac425 100644
--- a/tests/data/tutorial.md
+++ b/tests/data/tutorial.md
@@ -16,12 +16,9 @@ contributors:
   - the_best_contributor
 ---
 
-# Introduction
-{:.no_toc}
-
 The introduction
 
-> ### Agenda
+> <agenda-title></agenda-title>
 >
 > In this tutorial, we will deal with:
 >
@@ -32,4 +29,4 @@ The introduction
 
 # First section
 
-# Second section
\ No newline at end of file
+# Second section
diff --git a/tests/test_training_tutorial.py b/tests/test_training_tutorial.py
index af439fdd2..a65be4cb8 100644
--- a/tests/test_training_tutorial.py
+++ b/tests/test_training_tutorial.py
@@ -316,7 +316,7 @@ def test_tutorial_write_hands_on_tutorial() -> None:
     with open(tuto.tuto_fp) as tuto_f:
         tuto_c = tuto_f.read()
         assert "layout: tutorial_hands_on" in tuto_c
-        assert "# Introduction" in tuto_c
+        assert "<agenda" in tuto_c
         assert "URL1" in tuto_c
         assert "# Conclusion" in tuto_c
     shutil.rmtree("topics")