diff --git a/test/DynamoCoreWpfTests/WorkspaceSaving.cs b/test/DynamoCoreWpfTests/WorkspaceSaving.cs
index ddf82edd717..59f37d66193 100644
--- a/test/DynamoCoreWpfTests/WorkspaceSaving.cs
+++ b/test/DynamoCoreWpfTests/WorkspaceSaving.cs
@@ -982,7 +982,10 @@ public void CustomNodeWorkspaceSavedToSamePlaceNotCausingDuplicatedLibraryItems(
             var def = dynamoModel.CustomNodeManager.CreateCustomNode(nodeName, catName, "");
 
             var tempPath1 = Path.Combine(TempFolder, nodeName + ".dyf");
-            var tempPath2 = Path.Combine(TempFolder, nodeName + "_v1.dyf");
+            
+            // Create the folder first incase it does not exist
+            Directory.CreateDirectory(Path.Combine(TempFolder, nodeName, nodeName));
+            var tempPath2 = Path.Combine(TempFolder, nodeName, nodeName + ".dyf");
 
             var res = def.SaveAs(tempPath1, ViewModel.Model.EngineController.LiveRunnerRuntimeCore);
             Assert.IsTrue(res);