diff --git a/tools/before-test.cmd b/tools/before-test.cmd
index 41d6cf4..30cdc68 100644
--- a/tools/before-test.cmd
+++ b/tools/before-test.cmd
@@ -21,15 +21,18 @@
 setlocal
 
 
+:: CHANGE THESE VARIABLES TO UPDATE BENCHMARK
 set EXAMPLES_VER=1.0.2-dev.5
 set BENCHMARK_VER=220dev5
 
-set "SCRIPT_HOME=%~dp0"
-set "EXE_HOME=buildprod\bin\Release"
 
-:: Determine SUT executable path
-for %%a in ("%SCRIPT_HOME:~0,-1%") do set "SUT_PATH=%%~dpa"
-set SUT_PATH=%SUT_PATH%%EXE_HOME%
+set "SCRIPT_HOME=%~dp0"
+set "EXE_HOME=Release"
+
+::: Determine SUT executable path
+:: TODO: This may fail when there is more than one cmake buildprod folder
+for /d /r "%SCRIPT_HOME%..\" %%a in (*) do if /i "%%~nxa"=="bin" set "BUILD_HOME=%%a"
+set SUT_PATH=%BUILD_HOME%\%EXE_HOME%
 
 :: Check existence and apply default arguments
 IF NOT [%1]==[] ( set "SUT_VER=%~1"
diff --git a/tools/run-nrtest.cmd b/tools/run-nrtest.cmd
index d20087b..c39becb 100644
--- a/tools/run-nrtest.cmd
+++ b/tools/run-nrtest.cmd
@@ -15,6 +15,7 @@
 setlocal
 
 
+:: CHANGE THIS VARIABLES TO UPDATE BENCHMARK
 set BENCHMARK_VER=220dev5