diff --git a/src/Umbraco.Tests/Models/MediaXmlTest.cs b/src/Umbraco.Tests/Models/MediaXmlTest.cs
new file mode 100644
index 0000000000..8907cc4fc2
--- /dev/null
+++ b/src/Umbraco.Tests/Models/MediaXmlTest.cs
@@ -0,0 +1,86 @@
+using System.Linq;
+using System.Xml.Linq;
+using NUnit.Framework;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Tests.TestHelpers;
+using Umbraco.Tests.TestHelpers.Entities;
+using umbraco.editorControls.tinyMCE3;
+using umbraco.interfaces;
+
+namespace Umbraco.Tests.Models
+{
+    [TestFixture]
+    public class MediaXmlTest : BaseDatabaseFactoryTest
+    {
+        [SetUp]
+        public override void Initialize()
+        {
+            //this ensures its reset
+            PluginManager.Current = new PluginManager();
+
+            //for testing, we'll specify which assemblies are scanned for the PluginTypeResolver
+            PluginManager.Current.AssembliesToScan = new[]
+                {
+                    typeof(IDataType).Assembly,
+                    typeof(tinyMCE3dataType).Assembly
+                };
+
+            DataTypesResolver.Current = new DataTypesResolver(
+                PluginManager.Current.ResolveDataTypes());
+
+            base.Initialize();
+        }
+
+        [TearDown]
+        public override void TearDown()
+        {
+            //reset the app context
+            DataTypesResolver.Reset();
+
+            base.TearDown();
+        }
+        [Test]
+        public void Can_Generate_Xml_Representation_Of_Media()
+        {
+            // Arrange
+            var mediaType = MockedContentTypes.CreateImageMediaType();
+            ServiceContext.ContentTypeService.Save(mediaType);
+
+            var media = MockedMedia.CreateMediaImage(mediaType, -1);
+            ServiceContext.MediaService.Save(media, 0);
+
+            var nodeName = media.ContentType.Alias.ToSafeAliasWithForcingCheck();
+
+            // Act
+            XElement element = media.ToXml();
+
+            // Assert
+            Assert.That(element, Is.Not.Null);
+            Assert.That(element.Name.LocalName, Is.EqualTo(nodeName));
+            Assert.AreEqual(media.Id.ToString(), (string)element.Attribute("id"));
+            Assert.AreEqual(media.ParentId.ToString(), (string)element.Attribute("parentID"));
+            Assert.AreEqual(media.Level.ToString(), (string)element.Attribute("level"));
+            //Assert.AreEqual(media.CreatorId.ToString(), (string)element.Attribute("creatorID"));
+            Assert.AreEqual(media.SortOrder.ToString(), (string)element.Attribute("sortOrder"));
+            Assert.AreEqual(media.CreateDate.ToString("s"), (string)element.Attribute("createDate"));
+            Assert.AreEqual(media.UpdateDate.ToString("s"), (string)element.Attribute("updateDate"));
+            Assert.AreEqual(media.Name, (string)element.Attribute("nodeName"));
+            Assert.AreEqual(media.Name.FormatUrl().ToLower(), (string)element.Attribute("urlName"));
+            Assert.AreEqual(media.Path, (string)element.Attribute("path"));
+            Assert.AreEqual("", (string)element.Attribute("isDoc"));
+            Assert.AreEqual(media.ContentType.Id.ToString(), (string)element.Attribute("nodeType"));
+            //Assert.AreEqual(media.GetCreatorProfile().Name, (string)element.Attribute("creatorName"));
+            Assert.AreEqual(media.GetCreatorProfile().Name, (string)element.Attribute("writerName"));
+            Assert.AreEqual(media.CreatorId.ToString(), (string)element.Attribute("writerID"));
+            Assert.AreEqual(media.Version.ToString(), (string)element.Attribute("version"));
+            Assert.AreEqual("0", (string)element.Attribute("template"));
+
+            Assert.AreEqual(media.Properties["umbracoFile"].Value.ToString(), element.Elements("umbracoFile").Single().Value);
+            Assert.AreEqual(media.Properties["umbracoWidth"].Value.ToString(), element.Elements("umbracoWidth").Single().Value);
+            Assert.AreEqual(media.Properties["umbracoHeight"].Value.ToString(), element.Elements("umbracoHeight").Single().Value);
+            Assert.AreEqual(media.Properties["umbracoBytes"].Value.ToString(), element.Elements("umbracoBytes").Single().Value);
+            Assert.AreEqual(media.Properties["umbracoExtension"].Value.ToString(), element.Elements("umbracoExtension").Single().Value);
+        }
+    }
+}
\ No newline at end of file