diff --git a/test/tparser.nim b/test/tparser.nim
index b58c398..4b3a124 100644
--- a/test/tparser.nim
+++ b/test/tparser.nim
@@ -42,7 +42,8 @@ proc ensureDevKitCloneCorrect(pwd: string) {.compileTime.} =
     let cloneOutput = staticExec("cd \"" & pwd &
       "\" && git clone https://github.com/ingydotnet/yaml-dev-kit.git -b data")
     #if cError != 0:
-    if not dirExists(absolutePath):
+    if not(dirExists(absolutePath)) or not(dirExists(absolutePath / ".git")) or
+        not(dirExists(absolutePath / "229Q")):
       echo "could not clone https://github.com/ingydotnet/yaml-dev-kit.git. Make sure"
       echo "you are connected to the internet and your proxy settings are correct. output:\n"
       echo "$ git clone https://github.com/ingydotnet/yaml-dev-kit.git"
diff --git a/test/tquickstart.nim b/test/tquickstart.nim
index d80a2b4..5c8180a 100644
--- a/test/tquickstart.nim
+++ b/test/tquickstart.nim
@@ -104,7 +104,8 @@ proc testsFor(path: string, root: bool = true, titlePrefix: string = ""):
   result = newStmtList()
   let
     baseDir = staticExec("pwd")
-    nimPath = staticExec("which nim")
+    nimPathRaw = staticExec("which nim")
+    nimPath = if nimPathRaw[0] == '/': nimPathRaw else: baseDir / nimPathRaw
     title = titlePrefix & slurp(baseDir / path / "title").splitLines()[0]
   if fileExists(path / "00-code.nim"):
     var test = newCall("test", newLit(title))