Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/IO/MigrateAllFilesInFolderUsingCommandLineTool.cs
===================================================================
diff -u -r9f505373cf4c9881a874d216d84e243fa7e4fdcc -r027a8543d6c3f0c0f1063de9c0c6166d45e02a4f
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/IO/MigrateAllFilesInFolderUsingCommandLineTool.cs	(.../MigrateAllFilesInFolderUsingCommandLineTool.cs)	(revision 9f505373cf4c9881a874d216d84e243fa7e4fdcc)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/IO/MigrateAllFilesInFolderUsingCommandLineTool.cs	(.../MigrateAllFilesInFolderUsingCommandLineTool.cs)	(revision 027a8543d6c3f0c0f1063de9c0c6166d45e02a4f)
@@ -77,7 +77,7 @@
                 Report.Info("Migrating project file: " + sourceFilePath);
                 string fileName = Path.GetFileName(sourceFilePath);
                 string destinationFilePath = Path.Combine(targetFolder, fileName);
-                string commandToRun = "/C ..\\..\\..\\..\\..\\bin\\Debug\\Migratiehulpprogramma.exe " + @sourceFilePath + " " + @destinationFilePath + " >migration.log";
+                string commandToRun = "/C ..\\..\\..\\..\\..\\bin\\Debug\\Migratiehulpprogramma.exe \"" + @sourceFilePath + "\" \"" + @destinationFilePath + "\" >migration.log";
                 RunCommand(commandToRun);
                 Delay.Duration(new Duration(300));
                 ValidateMigratedFilesExists(destinationFilePath);
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script18.rxtst
===================================================================
diff -u -r6900fdeaa9afaf374686f608d3a6edaec8465e13 -r027a8543d6c3f0c0f1063de9c0c6166d45e02a4f
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script18.rxtst	(.../Script18.rxtst)	(revision 6900fdeaa9afaf374686f608d3a6edaec8465e13)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script18.rxtst	(.../Script18.rxtst)	(revision 027a8543d6c3f0c0f1063de9c0c6166d45e02a4f)
@@ -172,7 +172,7 @@
 				</description>
 				<databinding>
 					<var
-					dataname="migrationTargetFolder"
+					dataname="scriptOutputFolder"
 					datasourceid="d1f455d9-5741-41e6-983e-8e71f91f7a54"
 					variableid="f3b3e712-db1c-4e56-8986-c0607c00391a"
 					variablename="targetFolder">
@@ -353,7 +353,7 @@
 				<parameters>
 					<param
 					name="fielNameToOpen"
-					value="X:\script18\currentRelease\script17b.risk">
+					value="script17b.risk">
 					</param>
 				</parameters>
 			</smartfoldernode>