diff --git a/tests/misc/tspace in filename.nim b/tests/dir with space/tspace.nim
similarity index 100%
rename from tests/misc/tspace in filename.nim
rename to tests/dir with space/tspace.nim
diff --git a/tests/testament/tester.nim b/tests/testament/tester.nim
index ba3abd1bd..b37f72f04 100644
--- a/tests/testament/tester.nim
+++ b/tests/testament/tester.nim
@@ -57,7 +57,7 @@ let
 proc callCompiler(cmdTemplate, filename, options: string,
                   target: TTarget): TSpec =
   let c = parseCmdLine(cmdTemplate % ["target", targetToCmd[target],
-                       "options", options, "file", filename])
+                       "options", options, "file", filename.quoteShell])
   var p = startProcess(command=c[0], args=c[1.. -1],
                        options={poStdErrToStdOut, poUseShell})
   let outp = p.outputStream