diff --git a/kcidb/templates/build_description.txt.j2 b/kcidb/templates/build_description.txt.j2
index e54c4fb0..393749db 100644
--- a/kcidb/templates/build_description.txt.j2
+++ b/kcidb/templates/build_description.txt.j2
@@ -13,8 +13,7 @@ OVERVIEW
 
          Build: {{ misc_macros.valid_badge(build.valid) }}
 {% if build.tests %}
-         Tests: {{ test_macros.waived_status_badge(build.tests_root.waived,
-                                                   build.tests_root.status) }}
+         Tests: {{ test_macros.test_status(build.tests_root.waived_status_nodes) }}
 {% endif %}
 
 BUILD
diff --git a/kcidb/templates/checkout_description.txt.j2 b/kcidb/templates/checkout_description.txt.j2
index 10f0f746..a60b1a4a 100644
--- a/kcidb/templates/checkout_description.txt.j2
+++ b/kcidb/templates/checkout_description.txt.j2
@@ -13,11 +13,10 @@ OVERVIEW
 
       Checkout: {{ misc_macros.valid_badge(checkout.valid) }}
 {% if checkout.builds %}
-        Builds: {{ misc_macros.valid_badge(checkout.builds_valid) }}
+        Builds: {{ build_macros.build_status(checkout.builds) }}
 {% endif %}
 {% if checkout.tests %}
-         Tests: {{ test_macros.waived_status_badge(checkout.tests_root.waived,
-                                                   checkout.tests_root.status) }}
+         Tests: {{ test_macros.test_status(checkout.tests_root.waived_status_nodes) }}
 {% endif %}
 
 CHECKOUT
diff --git a/kcidb/templates/revision_description.txt.j2 b/kcidb/templates/revision_description.txt.j2
index db83b243..d91d51fc 100644
--- a/kcidb/templates/revision_description.txt.j2
+++ b/kcidb/templates/revision_description.txt.j2
@@ -15,11 +15,10 @@ OVERVIEW
        Patches: {{ misc_macros.valid_badge(revision.checkouts_valid) }}
 {% endif %}
 {% if revision.builds %}
-        Builds: {{ misc_macros.valid_badge(revision.builds_valid) }}
+        Builds: {{ build_macros.build_status(revision.builds) }}
 {% endif %}
 {% if revision.tests %}
-         Tests: {{ test_macros.waived_status_badge(revision.tests_root.waived,
-                                                   revision.tests_root.status) }}
+         Tests: {{ test_macros.test_status(revision.tests_root.waived_status_nodes) }}
 {% endif %}
 
 REVISION