diff --git a/tests/report/html/test.sh b/tests/report/html/test.sh
index 6600d7fad8..e0bcb1a4cc 100755
--- a/tests/report/html/test.sh
+++ b/tests/report/html/test.sh
@@ -37,13 +37,14 @@ rlJournalStart
grep -B 1 "/test/$test_name_suffix" $HTML | tee $tmp/$test_name_suffix
rlAssertGrep 'class="result error">error' $tmp/$test_name_suffix -F
sed -e "/name\">\/test\/$test_name_suffix/,/\/tr/!d" $HTML | tee $tmp/$test_name_suffix-note
- rlAssertGrep '
timeout | ' $tmp/$test_name_suffix-note -F
+ rlAssertGrep 'timeout' $tmp/$test_name_suffix-note -F
test_name_suffix=xfail
grep -B 1 "/test/$test_name_suffix" $HTML | tee $tmp/$test_name_suffix
rlAssertGrep 'class="result pass">pass' $tmp/$test_name_suffix -F
sed -e "/name\">\/test\/$test_name_suffix/,/\/tr/!d" $HTML | tee $tmp/$test_name_suffix-note
- rlAssertGrep 'test failed as expected, original test result: fail | ' $tmp/$test_name_suffix-note -F
+ rlAssertGrep 'test failed as expected' $tmp/$test_name_suffix-note -F
+ rlAssertGrep 'original test result: fail' $tmp/$test_name_suffix-note -F
rlPhaseEnd
if [ "$option" = "" ]; then
diff --git a/tmt/steps/report/html/template.html.j2 b/tmt/steps/report/html/template.html.j2
index c7ee14796c..c4626a6d86 100644
--- a/tmt/steps/report/html/template.html.j2
+++ b/tmt/steps/report/html/template.html.j2
@@ -266,7 +266,17 @@ Context:
{% endfor %}
data |
- {% if result.note %}{{ result.printable_note | e }}{% else %}-{% endif %} |
+
+ {% if result.note %}
+
+ {% for note in result.note %}
+ - {{ note | e }}
+ {% endfor %}
+
+ {% else %}
+ -
+ {% endif %}
+ |
{% if result.check %}
|