diff --git a/testament/tester.nim b/testament/tester.nim
index cf649c0c0f..1142cc8c09 100644
--- a/testament/tester.nim
+++ b/testament/tester.nim
@@ -86,7 +86,7 @@ proc callCompiler(cmdTemplate, filename, options: string,
   let c = parseCmdLine(cmdTemplate % ["target", targetToCmd[target],
                        "options", options, "file", filename.quoteShell,
                        "filedir", filename.getFileDir()])
-  var p = startProcess(command=c[0], args=c[1.. ^1],
+  var p = startProcess(command=c[0], args=c[1 .. ^1],
                        options={poStdErrToStdOut, poUsePath})
   let outp = p.outputStream
   var suc = ""
@@ -313,7 +313,9 @@ proc testSpec(r: var TResults, test: TTest, target = targetC) =
     inc(r.total)
     return
 
-  if expected.targets == {}:
+  if getEnv("NIM_COMPILE_TO_CPP", "false") == "true" and target == targetC and expected.targets == {}:
+    expected.targets.incl(targetCpp)
+  elif expected.targets == {}:
     expected.targets.incl(target)
 
   for target in expected.targets: