diff --git a/system-test/mdbci/mdbci_wrapper b/system-test/mdbci/mdbci_wrapper
index 05006df2d..00a455f19 100644
--- a/system-test/mdbci/mdbci_wrapper
+++ b/system-test/mdbci/mdbci_wrapper
@@ -4,5 +4,5 @@ export host=$user@$ip 2>&1 >/dev/null
 sshopt="-q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=120  "
 
 rsync  -avz  --progress -e "ssh $sshopt" ${MDBCI_VM_PATH}/ $host:${MDBCI_VM_PATH}/ 2>&1 >/dev/null
-ssh $sshopt $host "MDBCI_VM_PATH=$MDBCI_VM_PATH /home/$user/mdbci/mdbci $*" 2>/dev/null
+ssh $sshopt $host "MDBCI_VM_PATH=${MDBCI_VM_PATH} ${MDBCI_EXECUTABLE} $*" 2>/dev/null
 rsync  -avz  --progress -e "ssh $sshopt" $host:${MDBCI_VM_PATH}/ ${MDBCI_VM_PATH}/ 2>&1 >/dev/null
diff --git a/system-test/mdbci/run_test.sh b/system-test/mdbci/run_test.sh
index b19d97332..485424ced 100755
--- a/system-test/mdbci/run_test.sh
+++ b/system-test/mdbci/run_test.sh
@@ -62,6 +62,7 @@ mdbci destroy --force ${mdbci_config_name}
 ulimit -c unlimited
 
 cd ${script_dir}/../../
+rm -rf build
 mkdir build && cd build
 cmake .. -DBUILD_SYSTEM_TESTS=Y -DBUILDNAME=${mdbci_config_name} -DCMAKE_BUILD_TYPE=Debug
 cd system-test
diff --git a/system-test/mdbci/run_test_vm.sh b/system-test/mdbci/run_test_vm.sh
index e1bcabdba..5ade57af0 100755
--- a/system-test/mdbci/run_test_vm.sh
+++ b/system-test/mdbci/run_test_vm.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# $HOME/.config/mdbci/max-tst.key file should contain private key to access host
+
 # read the name of build scripts directory
 export script_dir="$(dirname $(readlink -f $0))"
 
@@ -10,6 +12,7 @@ export mdbci_config_name=${name:-$box-${curr_date}}
 export mdbci_config_name=`echo ${mdbci_config_name} | sed "s/?//g"`
 export MDBCI_VM_PATH=$HOME/${mdbci_config_name}_vms
 export PATH=$PATH:$HOME/mdbci
+export MDBCI_EXECUTABLE=`which mdbci`
 
 . ${script_dir}/set_run_test_variables.sh
 
@@ -57,6 +60,7 @@ test_env_list=(
     "JOB_NAME"
     "BUILD_NUMBER"
     "BUILD_TIMESTAMP"
+    "MDBCI_EXECUTABLE"
     "name"
     "target"
     "box"