diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs
index 4d24bd14987..65128bd3765 100644
--- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs
+++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/XUnitInstrumentation.cs
@@ -65,7 +65,10 @@ protected override void ConfigureFilters (XUnitTestRunner runner)
 				// From some failing corefx tests
 				new XUnitFilter ("category", "nonlinuxtests", true),
 				new XUnitFilter ("category", "nonmonotests", true),
-				new XUnitFilter ("category", "nonnetfxtests", true)
+				new XUnitFilter ("category", "nonnetfxtests", true),
+#if !DEBUG // aka "Release"
+				new XUnitFilter ("category", "nonuapaottests", true),
+#endif  // !DEBUG
 			};
 
 			if (excludedTestNames != null && excludedTestNames.Count > 0) {