diff --git a/src/System.Design/src/System.Design.Forwards.cs b/src/System.Design/src/System.Design.Forwards.cs
index 18f1bd005b0..1caaf008e7e 100644
--- a/src/System.Design/src/System.Design.Forwards.cs
+++ b/src/System.Design/src/System.Design.Forwards.cs
@@ -4,4 +4,10 @@
 
 using System.Runtime.CompilerServices;
 
+[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.DataGridColumnCollectionEditor))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ImageCollectionEditor))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ImageIndexEditor))]
 [assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.ListControlStringCollectionEditor))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.StringArrayEditor))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.StringCollectionEditor))]
+[assembly: TypeForwardedTo(typeof(System.Windows.Forms.Design.TabPageCollectionEditor))]
diff --git a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/EnsureEditorsTests.cs b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/EnsureEditorsTests.cs
index e013a6fac44..12b95a2c209 100644
--- a/src/System.Windows.Forms.Design.Editors/tests/UnitTests/EnsureEditorsTests.cs
+++ b/src/System.Windows.Forms.Design.Editors/tests/UnitTests/EnsureEditorsTests.cs
@@ -114,7 +114,6 @@ public void EnsureUITypeEditorForType(Type type, Type expectedEditorType)
         [InlineData(typeof(ToolStripTextBox), "Lines", typeof(StringArrayEditor))]
         [InlineData(typeof(TreeNode), "ImageIndex", typeof(ImageIndexEditor))]
         [InlineData(typeof(TreeNode), "ImageKey", typeof(ImageIndexEditor))]
-        [InlineData(typeof(TreeNode), "ImageIndexEditor", typeof(ImageIndexEditor))]
         [InlineData(typeof(TreeNode), "SelectedImageKey", typeof(ImageIndexEditor))]
         [InlineData(typeof(TreeNode), "StateImageKey", typeof(ImageIndexEditor))]
         [InlineData(typeof(TreeNode), "StateImageIndex", typeof(ImageIndexEditor))]