diff --git a/runtime/delegates.t4 b/runtime/delegates.t4
index 8626004c1e37..1a56085692c6 100644
--- a/runtime/delegates.t4
+++ b/runtime/delegates.t4
@@ -47,7 +47,7 @@
 			"int", "int", "exc_handle"
 		) {
 			WrappedManagedFunction = "UnwrapNSException",
-			OnlyDynamicUsage = true,
+			OnlyDynamicUsage = false,
 		},
 
 		new XDelegate ("MonoObject *", "IntPtr", "xamarin_get_block_wrapper_creator",
@@ -232,7 +232,7 @@
 			"MonoReflectionType *", "IntPtr", "type"
 		) {
 			WrappedManagedFunction = "TypeGetFullName",
-			OnlyDynamicUsage = true,
+			OnlyDynamicUsage = false,
 		},
 
 		new XDelegate ("char *", "IntPtr", "xamarin_lookup_managed_type_name",
diff --git a/tests/xharness/Jenkins.cs b/tests/xharness/Jenkins.cs
index 62f2a79e6759..5ac6112bd3d5 100644
--- a/tests/xharness/Jenkins.cs
+++ b/tests/xharness/Jenkins.cs
@@ -16,6 +16,7 @@ public class Jenkins
 		bool populating = true;
 
 		public Harness Harness;
+		public bool IncludeAll;
 		public bool IncludeClassicMac = true;
 		public bool IncludeBcl;
 		public bool IncludeMac = true;
@@ -156,6 +157,7 @@ class TestData
 			public bool Profiling;
 			public string LinkMode;
 			public string Defines;
+			public bool Ignored;
 		}
 
 		IEnumerable<TestData> GetTestData (RunTestTask test)
@@ -177,6 +179,7 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
 				switch (test.TestName) {
 				case "monotouch-test":
 					yield return new TestData { Variation = "Release (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = false, Profiling = false, Defines = "OPTIMIZEALL" };
+					yield return new TestData { Variation = "Debug (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = true, Profiling = false, Defines = "OPTIMIZEALL" };
 					break;
 				}
 				break;
@@ -186,6 +189,7 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
 					// The default is to run monotouch-test with the dynamic registrar (in the simulator), so that's already covered
 					yield return new TestData { Variation = "Debug (static registrar)", MTouchExtraArgs = "--registrar:static", Debug = true, Profiling = false };
 					yield return new TestData { Variation = "Release (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all", Debug = false, Profiling = false, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL" };
+					yield return new TestData { Variation = "Debug (all optimizations)", MTouchExtraArgs = "--registrar:static --optimize:all,-remove-uithread-checks", Debug = true, Profiling = false, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL", Ignored = !IncludeAll };
 					break;
 				}
 				break;
@@ -193,8 +197,14 @@ IEnumerable<TestData> GetTestData (RunTestTask test)
 			case "x86":
 				switch (test.TestName) {
 				case "xammac tests":
-					if (test.ProjectConfiguration == "Release")
-						yield return new TestData { Variation = "Release (all optimizations)", MonoBundlingExtraArgs = "--registrar:static --optimize:all", Debug = false, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL" };
+					switch (test.ProjectConfiguration) {
+					case "Release":
+						yield return new TestData { Variation = "Release (all optimizations)", MonoBundlingExtraArgs = "--registrar:static --optimize:all", Debug = false, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL"};
+						break;
+					case "Debug":
+						yield return new TestData { Variation = "Release (all optimizations)", MonoBundlingExtraArgs = "--registrar:static --optimize:all,-remove-uithread-checks", Debug = true, LinkMode = "Full", Defines = "LINKALL;OPTIMIZEALL", Ignored = !IncludeAll };
+						break;
+					}
 					break;
 				}
 				break;
@@ -221,6 +231,7 @@ IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<XBuildTask, T
 					var profiling = test_data.Profiling;
 					var link_mode = test_data.LinkMode;
 					var defines = test_data.Defines;
+					var ignored = test_data.Ignored;
 
 					var clone = task.TestProject.Clone ();
 					var clone_task = Task.Run (async () => {
@@ -265,7 +276,7 @@ IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<XBuildTask, T
 					};
 					T newVariation = creator (build, task);
 					newVariation.Variation = variation;
-					newVariation.Ignored = task.Ignored;
+					newVariation.Ignored = task.Ignored || ignored;
 					rv.Add (newVariation);
 				}
 			}
@@ -538,6 +549,7 @@ void SelectTestsByLabel (int pull_request)
 			SetEnabled (labels, "ios-extensions", ref IncludeiOSExtensions);
 			SetEnabled (labels, "ios-device", ref IncludeDevice);
 			SetEnabled (labels, "xtro", ref IncludeXtro);
+			SetEnabled (labels, "all", ref IncludeAll);
 
 			// enabled by default
 			SetEnabled (labels, "ios", ref IncludeiOS);