3 files changed, 15 insertions, 2 deletions
diff --git a/mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs
index 768cd5671da..2b20f06e971 100644
--- a/mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XmlReaderSettingsTests.cs
@@ -14,7 +14,7 @@ using System.Text;
 using System.Xml;
 using System.Xml.Schema;
 using NUnit.Framework;
-
+using System.Reflection;
 using ValidationFlags = System.Xml.Schema.XmlSchemaValidationFlags;
 using AssertType = NUnit.Framework.Assert;
 
@@ -443,5 +443,15 @@ namespace MonoTests.System.Xml
 			var r2 = XmlReader.Create (r, c);
 			Assert.IsTrue (r2.Settings.Async);
 		}
+
+		[Test]
+		public void LegacyXmlSettingsAreDisabled ()
+		{
+			// Make sure LegacyXmlSettings are always disabled on Mono
+			// https://bugzilla.xamarin.com/show_bug.cgi?id=60621
+			var enableLegacyXmlSettingsMethod = typeof(XmlReaderSettings).GetMethod ("EnableLegacyXmlSettings", 
+				BindingFlags.NonPublic | BindingFlags.Static);
+			Assert.IsFalse ((bool) enableLegacyXmlSettingsMethod.Invoke (null, null));
+		}
 	}
 }
diff --git a/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/Attr.cs b/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/Attr.cs
index 78fef4a73ee..27313d0c8af 100644
--- a/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/Attr.cs
+++ b/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/Attr/Attr.cs
@@ -482,6 +482,7 @@ namespace nist_dom.fundamental
         //----------------------------------------------------------------------------
 
         [Test]
+        [Ignore(".NET DOM implementation does not match W3C DOM specification.")]
         public void core0009A()
         {
             string computedValue = "";//0;
@@ -595,6 +596,7 @@ namespace nist_dom.fundamental
         //----------------------------------------------------------------------------
 
         [Test]
+        [Ignore(".NET DOM implementation does not match W3C DOM specification.")]
         public void core0011A()
         {
             string computedValue = "";//"";
diff --git a/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/NamedNodeMap/NamedNodeMap.cs b/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/NamedNodeMap/NamedNodeMap.cs
index eb4b3ddb71c..5f415070f42 100644
--- a/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/NamedNodeMap/NamedNodeMap.cs
+++ b/mcs/class/System.XML/Test/System.Xml/nist_dom/fundamental/NamedNodeMap/NamedNodeMap.cs
@@ -453,7 +453,8 @@ namespace nist_dom.fundamental
         //----------------------------------------------------------------------------
 
         [Test]
-	public void core0008M()
+        [Ignore(".NET DOM implementation does not match W3C DOM specification.")]
+        public void core0008M()
         {
             string computedValue = "";
             string expectedValue = "False";