diff --git a/src/send_kcidb.py b/src/send_kcidb.py
index 65d630b85..4d0894843 100755
--- a/src/send_kcidb.py
+++ b/src/send_kcidb.py
@@ -413,13 +413,17 @@ def _run(self, context):
                 )
 
             elif node['kind'] == 'test':
-                if is_hierarchy:
-                    self._get_test_data_recursively(node, context['origin'],
-                                                    parsed_test_node, parsed_build_node)
+                self._get_test_data(node, context['origin'],
+                                    parsed_test_node, parsed_build_node)
 
-                elif not self._api.node.count({'parent': node['id']}):
+            elif node['kind'] == 'job':
+                # Send only failed/incomplete job nodes
+                if node['result'] != 'pass':
                     self._get_test_data(node, context['origin'],
                                         parsed_test_node, parsed_build_node)
+                if is_hierarchy:
+                    self._get_test_data_recursively(node, context['origin'],
+                                                    parsed_test_node, parsed_build_node)
 
             revision = {
                 'checkouts': parsed_checkout_node,