diff --git a/tests/interdependent-binding-projects/Main.cs b/tests/interdependent-binding-projects/Main.cs
index 641e109285..71b7e7861a 100644
--- a/tests/interdependent-binding-projects/Main.cs
+++ b/tests/interdependent-binding-projects/Main.cs
@@ -34,4 +34,13 @@ public partial class AppDelegate : UIApplicationDelegate
 		UIApplication.Main (args, null, typeof (AppDelegate));
 	}
 }
+#else
+public static partial class TestLoader {
+	static partial void AddTestAssembliesImpl (BaseTouchRunner runner)
+	{
+		runner.Add (typeof (Xamarin.BindingTests2.BindingTest).Assembly);
+		runner.Add (typeof (Xamarin.BindingTests.ProtocolTest).Assembly);
+	}
+}
+
 #endif // !__WATCHOS__
diff --git a/tests/introspection/iOS/iOSApiSelectorTest.cs b/tests/introspection/iOS/iOSApiSelectorTest.cs
index 0e03f1a1dc..65baa66ee4 100644
--- a/tests/introspection/iOS/iOSApiSelectorTest.cs
+++ b/tests/introspection/iOS/iOSApiSelectorTest.cs
@@ -685,6 +685,11 @@ namespace Introspection {
 					return !TestRuntime.CheckXcodeVersion (8, 0);
 				case "HMLocationEvent":
 					return !TestRuntime.CheckXcodeVersion (9, 0);
+#if __WATCHOS__
+				case "INParameter":
+					// NSCopying conformance added in Xcode 10
+					return !TestRuntime.CheckXcodeVersion (10, 0);
+#endif
 				}
 				break;
 
diff --git a/tests/xharness/AppRunner.cs b/tests/xharness/AppRunner.cs
index 01197971a9..cbcacd5acf 100644
--- a/tests/xharness/AppRunner.cs
+++ b/tests/xharness/AppRunner.cs
@@ -371,7 +371,7 @@ namespace xharness
 			}
 			var passed = total - errors - failed - notRun - inconclusive - ignored - skipped - invalid;
 			var resultLine = $"Tests run: {total} Passed: {passed} Inconclusive: {inconclusive} Failed: {failed + errors} Ignored: {ignored + skipped + invalid}";
-			return (resultLine, errors != 0 || failed != 0);
+			return (resultLine, total == 0 || errors != 0 || failed != 0);
 		}
 
 		(string resultLine, bool failed) ParseNUnitXml (StreamReader stream, StreamWriter writer)
@@ -434,7 +434,7 @@ namespace xharness
 			string resultLine = $"Tests run: {total} Passed: {passed} Inconclusive: {inconclusive} Failed: {failed + errors} Ignored: {ignored + skipped + invalid}";
 			writer.WriteLine (resultLine);
 			
-			return (resultLine, errors != 0 || failed != 0);
+			return (resultLine, total == 0 | errors != 0 || failed != 0);
 		}
 		
 		(string resultLine, bool failed, bool crashed) ParseResult (Log listener_log, bool timed_out, bool crashed)
diff --git a/tools/bcl-test-importer/BCLTestImporter/BCLTestProjectGenerator.cs b/tools/bcl-test-importer/BCLTestImporter/BCLTestProjectGenerator.cs
index 0d67830df1..edfd064cbd 100644
--- a/tools/bcl-test-importer/BCLTestImporter/BCLTestProjectGenerator.cs
+++ b/tools/bcl-test-importer/BCLTestImporter/BCLTestProjectGenerator.cs
@@ -141,6 +141,9 @@ namespace BCLTestImporter {
 			"monotouch_Mono.CodeContracts_test.dll", // not supported by xamarin
 			"monotouch_Novell.Directory.Ldap_test.dll", // not supported by xamarin
 			"monotouch_Mono.Profiler.Log_xunit-test.dll", // special tests that need an extra app to connect as a profiler
+			"monotouch_System.ComponentModel.Composition_xunit-test.dll", // has no test classes, all test have been removed by mono
+			"monotouch_System.Net.Http.FunctionalTests_xunit-test.dll", // has no test classes, all test have been removed by mono
+			"monotouch_System.Runtime.Serialization_xunit-test.dll", // has no test classes, all test have been removed by mono
 		};
 		
 		// list of assemblies that are going to be ignored, any project with an assemblies that is ignored will