diff --git a/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs
index c55518dda..595a19dd4 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/EpisodeFileMovingServiceTests/MoveEpisodeFileFixture.cs
@@ -53,7 +53,7 @@ namespace NzbDrone.Core.Test.MediaFiles.EpisodeFileMovingServiceTests
                   .Setup(s => s.BuildSeasonPath(It.IsAny<Series>(), It.IsAny<int>()))
                   .Returns(@"C:\Test\TV\Series\Season 01".AsOsAgnostic());
 
-            var rootFolder = @"C:\Test\TV".AsOsAgnostic();
+            var rootFolder = @"C:\Test\TV\".AsOsAgnostic();
             Mocker.GetMock<IDiskProvider>()
                   .Setup(s => s.FolderExists(rootFolder))
                   .Returns(true);
diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
index 44bfcd8ad..774ac202c 100644
--- a/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
+++ b/src/NzbDrone.Core/MediaFiles/EpisodeFileMovingService.cs
@@ -194,7 +194,7 @@ namespace NzbDrone.Core.MediaFiles
         {
             Ensure.That(directoryName, () => directoryName).IsNotNullOrWhiteSpace();
 
-            var parentFolder = Path.GetDirectoryName(directoryName);
+            var parentFolder = new OsPath(directoryName).Directory.FullPath;
             if (!_diskProvider.FolderExists(parentFolder))
             {
                 CreateFolder(parentFolder);