diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs
index 30a690d702..cdbfb2b66e 100644
--- a/src/Umbraco.Tests/Services/EntityServiceTests.cs
+++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs
@@ -464,16 +464,16 @@ namespace Umbraco.Tests.Services
             var result = service.Get(c1.Id, UmbracoObjectTypes.Document);
             Assert.AreEqual("Test", result.Name);
             Assert.IsTrue(result.AdditionalData.ContainsKey("CultureNames"));
-            var cultureNames = (IDictionary<int, string>)result.AdditionalData["CultureNames"];
-            Assert.AreEqual("Test - FR", cultureNames[_langFr.Id]);
-            Assert.AreEqual("Test - ES", cultureNames[_langEs.Id]);
+            var cultureNames = (IDictionary<string, string>)result.AdditionalData["CultureNames"];
+            Assert.AreEqual("Test - FR", cultureNames[_langFr.IsoCode]);
+            Assert.AreEqual("Test - ES", cultureNames[_langEs.IsoCode]);
         }
 
         [Test]
         public void EntityService_Can_Get_Child_Content_By_ParentId_And_UmbracoObjectType_With_Variant_Names()
         {
             var service = ServiceContext.EntityService;
-            
+
             var contentType = MockedContentTypes.CreateSimpleContentType("test1", "Test1", false);
             contentType.Variations = ContentVariation.CultureNeutral;
             ServiceContext.ContentTypeService.Save(contentType);
@@ -502,13 +502,13 @@ namespace Umbraco.Tests.Services
                 {
                     Assert.AreEqual(1, entities[i].AdditionalData.Count);
                     Assert.AreEqual("CultureNames", entities[i].AdditionalData.Keys.First());
-                    var variantInfo = entities[i].AdditionalData.First().Value as IDictionary<int, string>;
+                    var variantInfo = entities[i].AdditionalData.First().Value as IDictionary<string, string>;
                     Assert.IsNotNull(variantInfo);
                     var keys = variantInfo.Keys.ToList();
                     var vals = variantInfo.Values.ToList();
-                    Assert.AreEqual(_langFr.Id, keys[0]);
+                    Assert.AreEqual(_langFr.IsoCode.ToLowerInvariant(), keys[0].ToLowerInvariant());
                     Assert.AreEqual("Test " + i + " - FR", vals[0]);
-                    Assert.AreEqual(_langEs.Id, keys[1]);
+                    Assert.AreEqual(_langEs.IsoCode.ToLowerInvariant(), keys[1].ToLowerInvariant());
                     Assert.AreEqual("Test " + i + " - ES", vals[1]);
                 }
                 else