diff --git a/tests/introspection/ApiCMAttachmentTest.cs b/tests/introspection/ApiCMAttachmentTest.cs
index 97db323daa..4802ef877b 100644
--- a/tests/introspection/ApiCMAttachmentTest.cs
+++ b/tests/introspection/ApiCMAttachmentTest.cs
@@ -168,9 +168,9 @@ namespace Introspection {
 		protected virtual bool Skip (string nativeName)
 		{
 			if (nativeName.Contains ("`")) {
-				nativeName = nativeName.Substring (0, nativeName.IndexOf ("`"));
+				nativeName = nativeName.Substring (0, nativeName.IndexOf ('`'));
 			}
-			if (nativeName.StartsWith ("CGPDF"))  // all those types crash the app
+			if (nativeName.StartsWith ("CGPDF", StringComparison.Ordinal))  // all those types crash the app
 				return true;
 			switch (nativeName) {
 			case "CFMachPort":
@@ -324,7 +324,7 @@ namespace Introspection {
 					Size = 16.0f
 				};
 				using (var fd = new CTFontDescriptor (fda))
-					return new CTFont (fd, 10, CTFontOptions.Default);
+					return new CTFont (fd, 10);
 			case "CTFontCollection":
 				return new CTFontCollection (new CTFontCollectionOptions ());
 			case "CTFontDescriptor":
diff --git a/tests/introspection/iOS/iOSApiProtocolTest.cs b/tests/introspection/iOS/iOSApiProtocolTest.cs
index 55d560504d..3919106930 100644
--- a/tests/introspection/iOS/iOSApiProtocolTest.cs
+++ b/tests/introspection/iOS/iOSApiProtocolTest.cs
@@ -626,6 +626,12 @@ namespace Introspection {
 				case "ADBannerView":
 				case "UIAlertView":
 					return !TestRuntime.CheckXcodeVersion (8, 0);
+				case "MKOverlayView":
+				case "MKCircleView":
+				case "MKOverlayPathView":
+				case "MKPolygonView":
+				case "MKPolylineView":
+					return !TestRuntime.CheckXcodeVersion (7,0);
 				}
 				break;