diff --git a/src/components/Edges/wrapEdge.tsx b/src/components/Edges/wrapEdge.tsx
index 0f2938bd..631decc6 100644
--- a/src/components/Edges/wrapEdge.tsx
+++ b/src/components/Edges/wrapEdge.tsx
@@ -157,6 +157,7 @@ export default (EdgeComponent: ComponentType<EdgeProps>) => {
           targetHandleId={targetHandleId}
           markerStart={markerStartUrl}
           markerEnd={markerEndUrl}
+          data-testid={`rf__edge-${id}`}
         />
         {handleEdgeUpdate && (
           <g
diff --git a/src/components/Nodes/wrapNode.tsx b/src/components/Nodes/wrapNode.tsx
index d6a8d0cc..5efee901 100644
--- a/src/components/Nodes/wrapNode.tsx
+++ b/src/components/Nodes/wrapNode.tsx
@@ -135,6 +135,7 @@ export default (NodeComponent: ComponentType<NodeProps>) => {
         onContextMenu={onContextMenuHandler}
         onClick={onSelectNodeHandler}
         onDoubleClick={onDoubleClickHandler}
+        data-testid={`rf__node-${id}`}
         data-id={id}
       >
         <Provider value={id}>