diff --git a/tools/nimsuggest/tester.nim b/tools/nimsuggest/tester.nim
index 70a7da5b26..ecd33b0a16 100644
--- a/tools/nimsuggest/tester.nim
+++ b/tools/nimsuggest/tester.nim
@@ -11,7 +11,7 @@ type
     script: seq[(string, string)]
 
 const
-  curDir = when defined(windows): "" else: "./"
+  curDir = when defined(windows): "" else: ""
   DummyEof = "!EOF!"
 
 proc parseTest(filename: string): Test =
@@ -90,7 +90,7 @@ proc runTest(filename: string): int =
 
 proc main() =
   var failures = 0
-  for x in walkFiles("tests/t*.nim"):
+  for x in walkFiles(getAppDir() / "tests/t*.nim"):
     echo "Test ", x
     failures += runTest(expandFilename(x))
   if failures > 0:
diff --git a/tools/nimsuggest/tests/tstrutils.nim b/tools/nimsuggest/tests/tstrutils.nim
index 667c1660c4..f5cda95053 100644
--- a/tools/nimsuggest/tests/tstrutils.nim
+++ b/tools/nimsuggest/tests/tstrutils.nim
@@ -1,6 +1,6 @@
 discard """
-$nimsuggest --tester ../nim/lib/pure/strutils.nim
->def ../nim/lib/pure/strutils.nim:2300:6
+$nimsuggest --tester lib/pure/strutils.nim
+>def lib/pure/strutils.nim:2300:6
 def;;skTemplate;;system.doAssert;;proc (cond: bool, msg: string): typed;;*/lib/system.nim;;*;;9;;"";;100
 """