diff --git a/Directory.Build.props b/Directory.Build.props
index 74352a81..79e228b2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -22,7 +22,7 @@
 		<XunitVersion>2.7.0</XunitVersion>
 		<XunitRunnerVisualStudioVersion>2.5.7</XunitRunnerVisualStudioVersion>
 		<MoqVersion>4.20.70</MoqVersion>
-    <TestableIOSystemIOAbstractionsTestingHelpersVersion>20.0.15</TestableIOSystemIOAbstractionsTestingHelpersVersion>
+    <TestableIOSystemIOAbstractionsTestingHelpersVersion>21.0.2</TestableIOSystemIOAbstractionsTestingHelpersVersion>
 		<CoverletCollector>3.2.0</CoverletCollector>
 	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Crossroads/Services/PackageApplicationBuilder.cs b/src/Crossroads/Services/PackageApplicationBuilder.cs
index e215d09b..a846f74a 100644
--- a/src/Crossroads/Services/PackageApplicationBuilder.cs
+++ b/src/Crossroads/Services/PackageApplicationBuilder.cs
@@ -154,7 +154,7 @@ private void CopyIncludeDirectories()
 
             foreach (var includeDirectory in Option.Include)
             {
-                IDirectoryInfo dirInfo = fileSystem.DirectoryInfo.FromDirectoryName(includeDirectory);
+                IDirectoryInfo dirInfo = fileSystem.DirectoryInfo.New(includeDirectory);
                 CopyDirectory(includeDirectory, Path.Combine(assetsDirectory, dirInfo.Name), true);
             }
         }
@@ -179,7 +179,7 @@ private string launcherSourceDirectory
 
         private void CopyDirectory(string sourceDirName, string destDirName, bool copySubDirs)
         {
-            IDirectoryInfo dir = fileSystem.DirectoryInfo.FromDirectoryName(sourceDirName);
+            IDirectoryInfo dir = fileSystem.DirectoryInfo.New(sourceDirName);
 
             IDirectoryInfo[] dirs = dir.GetDirectories();
                                         
diff --git a/test/Crossroads.Test/Services/PackageApplicationBuilderTests.cs b/test/Crossroads.Test/Services/PackageApplicationBuilderTests.cs
index 149907cd..6901d0cb 100644
--- a/test/Crossroads.Test/Services/PackageApplicationBuilderTests.cs
+++ b/test/Crossroads.Test/Services/PackageApplicationBuilderTests.cs
@@ -135,10 +135,10 @@ public async Task Build_OnLinux_WithValidInclude_Success()
         public async Task Build_Dispose_WorkingDirDeleteFailure__ResolveException()
         {
             var fileSystem = new Mock<IFileSystem>();
-            fileSystem.Setup(x => x.DirectoryInfo.FromDirectoryName(It.IsAny<string>())).Returns(It.IsAny<DirectoryInfoBase>());
-            fileSystem.Setup(x => x.DirectoryInfo.FromDirectoryName(It.IsAny<string>()).GetDirectories()).Returns(It.IsAny<DirectoryInfoBase[]>());
-            fileSystem.Setup(x => x.DirectoryInfo.FromDirectoryName(It.IsAny<string>()).GetFiles()).Returns(Array.Empty<FileInfoBase>);
-            fileSystem.Setup(x => x.DirectoryInfo.FromDirectoryName(It.IsAny<string>()).GetDirectories()).Returns(Array.Empty<DirectoryInfoBase>);
+            fileSystem.Setup(x => x.DirectoryInfo.New(It.IsAny<string>())).Returns(It.IsAny<DirectoryInfoBase>());
+            fileSystem.Setup(x => x.DirectoryInfo.New(It.IsAny<string>()).GetDirectories()).Returns(It.IsAny<DirectoryInfoBase[]>());
+            fileSystem.Setup(x => x.DirectoryInfo.New(It.IsAny<string>()).GetFiles()).Returns(Array.Empty<FileInfoBase>);
+            fileSystem.Setup(x => x.DirectoryInfo.New(It.IsAny<string>()).GetDirectories()).Returns(Array.Empty<DirectoryInfoBase>);
             fileSystem.Setup(x => x.Directory.Exists(It.IsAny<string>())).Returns(true);
             fileSystem.Setup(x => x.Directory.Delete(It.IsAny<string>(), It.IsAny<bool>())).Throws(new Exception());
             var resource = new Mock<IResourcesAssemblyBuilder>();