diff --git a/src/send_kcidb.py b/src/send_kcidb.py
index 67a01d664..1cd348566 100755
--- a/src/send_kcidb.py
+++ b/src/send_kcidb.py
@@ -352,15 +352,16 @@ def _parse_test_node(self, origin, test_node):
             compatible = self._platforms[platform].compatible
             self.log.info(f"Compatible string: {test_node['id']}:{compatible}")
 
+        runtime = test_node['data'].get('runtime')
         parsed_test_node = {
             'build_id': build_id,
             'id': f"{origin}:{test_node['id']}",
             'origin': origin,
             'comment': f"{test_node['name']} on {platform} \
-in {test_node['data'].get('runtime')}",
+in {runtime}",
             'start_time': self._set_timezone(test_node['created']),
             'environment': {
-                'comment': f"Runtime: {test_node['data'].get('runtime')}",
+                'comment': f"Runtime: {runtime}",
                 'compatible': compatible,
                 'misc': {
                     'platform': platform,
@@ -374,6 +375,7 @@ def _parse_test_node(self, origin, test_node):
                 'compiler': test_node['data'].get('compiler'),
                 'kernel_type': test_node['data'].get('kernel_type'),
                 'arch': test_node['data'].get('arch'),
+                'runtime': runtime,
             }
         }