diff --git a/igt-vis/templates/test-result.mako b/igt-vis/templates/test-result.mako
index 53a8bb9e0c6c15c243c681a43c399744c8fea0bc..8d0be6abdce532e3c77b08a5ed78f7f29055496a 100644
--- a/igt-vis/templates/test-result.mako
+++ b/igt-vis/templates/test-result.mako
@@ -82,7 +82,7 @@ if 'run' in test:
           <td>
               % if var == 'dmesg':
                 % for idx, dmesg in enumerate(test[var]):
-                  <div><span id="${dmesg.style}${idx}" class="${dmesg.style}">${dmesg.message | h}</span></div>
+                  <div><span id="${dmesg.style}${idx}" class="dmesg ${dmesg.style}">${dmesg.message | h}</span></div>
                 % endfor
               % else:
                 <pre>${test[var] | h}</pre>
@@ -95,7 +95,7 @@ if 'run' in test:
 
     ## Highlighting logs with [IGT] in them
     <script>
-        document.querySelectorAll("[id*='dmesg-normal']").forEach(x =>
+        document.querySelectorAll("span.dmesg").forEach(x =>
             x.textContent.includes("[IGT]") && (x.classList.add("dmesg-igt"))
         );
     </script>
diff --git a/site-publishing/assets/test_result.css b/site-publishing/assets/test_result.css
index ee35f194cee3c7b477160cf33a826de804afe9fc..ad8492bc86803a53e135a07b853e812ab16af8ef 100644
--- a/site-publishing/assets/test_result.css
+++ b/site-publishing/assets/test_result.css
@@ -38,16 +38,16 @@ tr:nth-child(odd) > td:first-child {
     visibility: hidden;
 }
 
-.dmesg-warnings {
+span.dmesg-warnings {
     color: orangered;
     font-weight: bold;
 }
 
-.dmesg-igt {
+span.dmesg-igt {
     background-color: #ffffba;
 }
 
-.dmesg-warnings, .dmesg-normal {
+span.dmesg {
     white-space: pre;
     font-family: monospace;
     word-wrap: normal;