diff --git a/tests/t00002/.clang-uml b/tests/t00002/.clang-uml
index 4e0840f2..c27c8e78 100644
--- a/tests/t00002/.clang-uml
+++ b/tests/t00002/.clang-uml
@@ -13,9 +13,9 @@ diagrams:
         - clanguml::t00002
     plantuml:
       after:
-        - 'note left of @A(A) : {{ comment("A") }}'
-        - 'note top of @A(B) : {{ comment("clanguml::t00002::B") }}'
+        - '{% set e=element("A") %} note left of {{ e.alias }} : {{ trim(e.comment.brief.0) }}'
+        - '{% set e=element("clanguml::t00002::B") %} note top of {{ e.alias }} : {{ trim(e.comment.brief.0) }}'
         - |
           note right of {{ alias("D") }}
-          {{ comment("D") }}
+              {{ comment("D").text }}
           end note
\ No newline at end of file
diff --git a/tests/t30001/.clang-uml b/tests/t30001/.clang-uml
index e025dbc5..375e6528 100644
--- a/tests/t30001/.clang-uml
+++ b/tests/t30001/.clang-uml
@@ -18,5 +18,5 @@ diagrams:
         - "' t30001 test package diagram"
       after:
         - 'note right of {{ alias("A::AA::AAA") }}: A AAA note...'
-        - 'note top of {{ alias("A::AA") }} : {{ comment("A::AA") }}'
-        - 'note top of {{ alias("B::AA") }} : {{ comment("B::AA") }}'
+        - '{% set e=element("A::AA") %} note top of {{ alias("A::AA") }} : {{ e.comment.formatted }}'
+        - '{% set e=element("B::AA") %} note top of {{ alias("B::AA") }} : {{ e.comment.formatted }}'