diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Cities/CityTypes.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Cities/CityTypes.cs
index c1e212beb..66f665380 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Cities/CityTypes.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Cities/CityTypes.cs
@@ -51,7 +51,13 @@ public City() {
         public string CountyName { get; set; }
         public string StateName { get; set; }
         public County County {get;set;}
+#if NET
+#nullable enable
+        public string? ZoneName { get; set; }
+#nullable restore
+#else
         public string ZoneName { get; set; }
+#endif
         public string CalculatedCounty { get { return this.CountyName; } set { } }
         public int ZoneID { get; set; }
 
diff --git a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Northwind/EF_Northwind.cs b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Northwind/EF_Northwind.cs
index e85e80d7a..f505ce40a 100644
--- a/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Northwind/EF_Northwind.cs
+++ b/src/Test/Desktop/OpenRiaServices.Common.DomainServices.Test/Northwind/EF_Northwind.cs
@@ -541,10 +541,16 @@ public static class OrderDetailMetadata
     public partial class Product
     {
         private string _resolveMethod = String.Empty;
-        
+
         // Additional data member to enable resolve logic to differ based on the test scenario string being passed in
         [DataMember]
+#if NET
+#nullable enable
+        public string? ResolveMethod
+#nullable restore
+#else
         public string ResolveMethod
+#endif
         {
             get
             {