diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodReturnParameterDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodReturnParameterDataFlow.cs
index 394f6151ed2e9e..544e6318f120a7 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodReturnParameterDataFlow.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/MethodReturnParameterDataFlow.cs
@@ -36,6 +36,7 @@ public static void Main ()
 			instance.ReturnWithRequirementsAlwaysThrows ();
 
 			UnsupportedReturnType ();
+			UnsupportedReturnTypeAndParameter (null);
 		}
 
 		static Type NoRequirements ()
diff --git a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/PropertyDataFlow.cs b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/PropertyDataFlow.cs
index 1c3713e274b62b..5dbca227bc9127 100644
--- a/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/PropertyDataFlow.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests.Cases/DataFlow/PropertyDataFlow.cs
@@ -32,6 +32,7 @@ public static void Main ()
 			instance.PropertyPublicParameterlessConstructorWithExplicitAccessors = null;
 			instance.PropertyPublicConstructorsWithExplicitAccessors = null;
 			instance.PropertyNonPublicConstructorsWithExplicitAccessors = null;
+			_ = PropertyWithUnsupportedType;
 
 			TestAutomaticPropagation ();
 
diff --git a/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs b/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs
index bef6cd7426973a..b2c670447f1cfc 100644
--- a/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs
+++ b/src/tools/illink/test/Mono.Linker.Tests/TestCasesRunner/ResultChecker.cs
@@ -974,16 +974,7 @@ bool LogMessageHasSameOriginMember (MessageContainer mc, ICustomAttributeProvide
 
 				var actualMember = origin?.Provider as IMemberDefinition;
 				var expectedOriginMember = expectedOriginProvider as IMemberDefinition;
-				if (actualMember?.FullName == expectedOriginMember.FullName)
-					return true;
-
-				// Compensate for cases where for some reason the OM doesn't preserve the declaring types
-				// on certain things after trimming.
-				if (actualMember != null && actualMember?.DeclaringType == null &&
-					actualMember?.Name == expectedOriginMember.Name)
-					return true;
-
-				return false;
+				return actualMember?.FullName == expectedOriginMember.FullName;
 			}
 		}