diff --git a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
index ce14404196..669a1ee5c7 100644
--- a/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
+++ b/src/Umbraco.Tests/Models/Mapping/ContentWebModelMappingTests.cs
@@ -4,12 +4,15 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using AutoMapper;
+using Moq;
 using NUnit.Framework;
 using Umbraco.Core;
+using Umbraco.Core.Dictionary;
 using Umbraco.Core.Models;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Tests.TestHelpers;
 using Umbraco.Tests.TestHelpers.Entities;
+using Umbraco.Web.Dictionary;
 using Umbraco.Web.Models.ContentEditing;
 using Umbraco.Web.Models.Mapping;
 using umbraco;
@@ -21,6 +24,14 @@ namespace Umbraco.Tests.Models.Mapping
     [TestFixture]
     public class ContentWebModelMappingTests : BaseDatabaseFactoryTest
     {
+        protected override void FreezeResolution()
+        {
+            CultureDictionaryFactoryResolver.Current = new CultureDictionaryFactoryResolver(
+                Mock.Of<ICultureDictionaryFactory>());
+
+            base.FreezeResolution();
+        }
+
         [PropertyEditor("Test.Test", "Test", "~/Test.html")]
         public class TestPropertyEditor : PropertyEditor
         {
diff --git a/src/Umbraco.Tests/PropertyEditors/DropDownPropertyPreValueEditorTests.cs b/src/Umbraco.Tests/PropertyEditors/DropDownPropertyPreValueEditorTests.cs
index ba842b1800..ce9b7f70b5 100644
--- a/src/Umbraco.Tests/PropertyEditors/DropDownPropertyPreValueEditorTests.cs
+++ b/src/Umbraco.Tests/PropertyEditors/DropDownPropertyPreValueEditorTests.cs
@@ -103,11 +103,11 @@ namespace Umbraco.Tests.PropertyEditors
 
             Assert.AreEqual(1, result.Count);
             Assert.IsTrue(result.ContainsKey("items"));
-            var items = result["items"] as IDictionary<int, string>;
+            var items = result["items"] as IDictionary<int, IDictionary<string, object>>;
             Assert.IsNotNull(items);
-            Assert.AreEqual("Item 1", items[1]);
-            Assert.AreEqual("Item 2", items[2]);
-            Assert.AreEqual("Item 3", items[3]);
+            Assert.AreEqual("Item 1", items[1]["value"]);
+            Assert.AreEqual("Item 2", items[2]["value"]);
+            Assert.AreEqual("Item 3", items[3]["value"]);
         }
 
     }