diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
index b0c9e28c98..0fa70315fd 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/DeferredDrawingContextImplTests.cs
@@ -104,8 +104,8 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
 
             Assert.Equal(2, node.DrawOperations.Count);
-            Assert.IsType<RectangleNode>(node.DrawOperations[0]);
-            Assert.IsType<RectangleNode>(node.DrawOperations[1]);
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
+            Assert.IsType<RectangleNode>(node.DrawOperations[1].Item);
         }
 
         [Fact]
@@ -125,9 +125,9 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             }
 
             Assert.Equal(1, node.DrawOperations.Count);
-            Assert.Same(operation, node.DrawOperations.Single());
+            Assert.Same(operation.Item, node.DrawOperations.Single().Item);
 
-            Assert.IsType<RectangleNode>(node.DrawOperations[0]);
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
         }
 
         [Fact]
@@ -149,7 +149,7 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
             Assert.Equal(1, node.DrawOperations.Count);
             Assert.NotSame(operation, node.DrawOperations.Single());
 
-            Assert.IsType<RectangleNode>(node.DrawOperations[0]);
+            Assert.IsType<RectangleNode>(node.DrawOperations[0].Item);
         }
 
         [Fact]
diff --git a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
index 44b9ebe8ce..2eb3dfb15c 100644
--- a/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Rendering/SceneGraph/SceneBuilderTests.cs
@@ -53,15 +53,15 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 Assert.Equal(1, borderNode.Children.Count);
                 Assert.Equal(1, borderNode.DrawOperations.Count);
 
-                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0];
+                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
                 Assert.Equal(Brushes.Red, backgroundNode.Brush);
 
-                var textBlockNode = (VisualNode)borderNode.Children[0];
+                var textBlockNode = borderNode.Children[0];
                 Assert.Same(textBlockNode, result.FindNode(textBlock));
                 Assert.Same(textBlock, textBlockNode.Visual);
                 Assert.Equal(1, textBlockNode.DrawOperations.Count);
 
-                var textNode = (TextNode)textBlockNode.DrawOperations[0];
+                var textNode = (TextNode)textBlockNode.DrawOperations[0].Item;
                 Assert.NotNull(textNode.Text);
             }
         }
@@ -358,15 +358,15 @@ namespace Avalonia.Visuals.UnitTests.Rendering.SceneGraph
                 var borderNode = (VisualNode)result.Root.Children[0];
                 Assert.Same(border, borderNode.Visual);
 
-                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0];
+                var backgroundNode = (RectangleNode)borderNode.DrawOperations[0].Item;
                 Assert.NotSame(initialBackgroundNode, backgroundNode);
                 Assert.Equal(Brushes.Green, backgroundNode.Brush);
 
                 var textBlockNode = (VisualNode)borderNode.Children[0];
                 Assert.Same(textBlock, textBlockNode.Visual);
 
-                var textNode = (TextNode)textBlockNode.DrawOperations[0];
-                Assert.Same(initialTextNode, textNode);
+                var textNode = (TextNode)textBlockNode.DrawOperations[0].Item;
+                Assert.Same(initialTextNode.Item, textNode);
             }
         }