diff --git a/Makefile b/Makefile
index 588ac7b088d1ca17e9777335a8858c6633de5c7a..f8961215365df325ca67d83c84827a155a74267c 100644
--- a/Makefile
+++ b/Makefile
@@ -165,7 +165,7 @@ REALTARGET := $(TESTTARGET)
 endif
 .PHONY: $(TESTTARGET)
 ${TESTTARGET}:
-	@python3 $(MAPLE_ROOT)/testsuite/driver/src/driver.py --target=$(REALTARGET) --run-path=$(MAPLE_ROOT)/output/$(MAPLE_BUILD_TYPE)/testsuite $(if $(MOD), --mod=$(MOD),) --j=$(THREADS) --retry --report=$(MAPLE_ROOT)/report.txt
+	@python3 $(MAPLE_ROOT)/testsuite/driver/src/driver.py --target=$(REALTARGET) --run-path=$(MAPLE_ROOT)/output/$(MAPLE_BUILD_TYPE)/testsuite $(if $(MOD), --mod=$(MOD),) --j=$(THREADS)
 endif
 
 .PHONY: cleanrsd
diff --git a/testsuite/driver/src/mode/O0.py b/testsuite/driver/src/mode/O0.py
index 2d84ecb3494b72efee3e092b3da576d4b25d884e..34c0040e1a2f60f08729be5e90fddcc4b2769167 100644
--- a/testsuite/driver/src/mode/O0.py
+++ b/testsuite/driver/src/mode/O0.py
@@ -18,20 +18,20 @@ O0 = {
     "compile": [
         Java2dex(
             jar_file=[
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar",
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar"
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar"
             ],
             outfile="${APP}.dex",
             infile=["${APP}.java","${EXTRA_JAVA_FILE}"]
         ),
         Dex2mpl(
-            dex2mpl="${OUT_ROOT}/aarch64-clang-release/bin/dex2mpl",
-            mplt="${OUT_ROOT}/aarch64-clang-release/libjava-core/host-x86_64-O2/libcore-all.mplt",
+            dex2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/dex2mpl",
+            mplt="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/libjava-core/host-x86_64-O2/libcore-all.mplt",
             litprofile="${OUT_ROOT}/tools/codetricks/profile.pv/meta.list",
             infile="${APP}.dex"
         ),
         Maple(
-            maple="${OUT_ROOT}/aarch64-clang-release/bin/maple",
+            maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple",
             run=["me", "mpl2mpl", "mplcg"],
             option={
                 "me": "--quiet",
@@ -42,7 +42,7 @@ O0 = {
             infile="${APP}.mpl"
         ),
         Linker(
-            lib="host-x86_64-O0",
+            lib="host-x86_64-O2",
         )
     ],
     "run": [
@@ -53,11 +53,11 @@ O0 = {
             qemu="${OUT_ROOT}/tools/bin/qemu-aarch64",
             qemu_libc="/usr/aarch64-linux-gnu",
             qemu_ld_lib=[
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party",
-                "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-O0",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-O2",
                 "./"
             ],
-            mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh",
+            mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh",
             garbage_collection_kind="RC",
             xbootclasspath="libcore-all.so",
             infile="${APP}.so",
@@ -75,11 +75,11 @@ O0 = {
             qemu="${OUT_ROOT}/tools/bin/qemu-aarch64",
             qemu_libc="/usr/aarch64-linux-gnu",
             qemu_ld_lib=[
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party",
-                "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-O0",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-O2",
                 "./"
             ],
-            mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh",
+            mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh",
             garbage_collection_kind="RC",
             xbootclasspath="libcore-all.so",
             infile="${APP}.so",
@@ -97,11 +97,11 @@ O0 = {
             qemu="${OUT_ROOT}/tools/bin/qemu-aarch64",
             qemu_libc="/usr/aarch64-linux-gnu",
             qemu_ld_lib=[
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party",
-                "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-O0",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-O2",
                 "./"
             ],
-            mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh",
+            mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh",
             garbage_collection_kind="RC",
             xbootclasspath="libcore-all.so",
             infile="${APP}.so",
diff --git a/testsuite/driver/src/mode/O2.py b/testsuite/driver/src/mode/O2.py
index 822e4adc48780aedfa15e3ae504cb62b7dcc5496..237ac51be1f645c2467bda44471b5deca089b23d 100644
--- a/testsuite/driver/src/mode/O2.py
+++ b/testsuite/driver/src/mode/O2.py
@@ -18,20 +18,20 @@ O2 = {
     "compile": [
         Java2dex(
             jar_file=[
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar",
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar"
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-oj_intermediates/classes.jar",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party/JAVA_LIBRARIES/core-libart_intermediates/classes.jar"
             ],
             outfile="${APP}.dex",
             infile=["${APP}.java","${EXTRA_JAVA_FILE}"]
         ),
         Dex2mpl(
-            dex2mpl="${OUT_ROOT}/aarch64-clang-release/bin/dex2mpl",
-            mplt="${OUT_ROOT}/aarch64-clang-release/libjava-core/host-x86_64-O2/libcore-all.mplt",
+            dex2mpl="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/dex2mpl",
+            mplt="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/libjava-core/host-x86_64-O2/libcore-all.mplt",
             litprofile="${OUT_ROOT}/tools/codetricks/profile.pv/meta.list",
             infile="${APP}.dex"
         ),
         Maple(
-            maple="${OUT_ROOT}/aarch64-clang-release/bin/maple",
+            maple="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/bin/maple",
             run=["me", "mpl2mpl", "mplcg"],
             option={
                 "me": "--O2 --quiet",
@@ -50,11 +50,11 @@ O2 = {
             qemu="${OUT_ROOT}/tools/bin/qemu-aarch64",
             qemu_libc="/usr/aarch64-linux-gnu",
             qemu_ld_lib=[
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party",
-                "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-O2",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-O2",
                 "./"
             ],
-            mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh",
+            mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh",
             garbage_collection_kind="RC",
             xbootclasspath="libcore-all.so",
             infile="${APP}.so",
@@ -71,11 +71,11 @@ O2 = {
             qemu="${OUT_ROOT}/tools/bin/qemu-aarch64",
             qemu_libc="/usr/aarch64-linux-gnu",
             qemu_ld_lib=[
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party",
-                "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-O2",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-O2",
                 "./"
             ],
-            mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh",
+            mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh",
             garbage_collection_kind="RC",
             xbootclasspath="libcore-all.so",
             infile="${APP}.so",
@@ -92,11 +92,11 @@ O2 = {
             qemu="${OUT_ROOT}/tools/bin/qemu-aarch64",
             qemu_libc="/usr/aarch64-linux-gnu",
             qemu_ld_lib=[
-                "${OUT_ROOT}/aarch64-clang-release/ops/third_party",
-                "${OUT_ROOT}/aarch64-clang-release/ops/host-x86_64-O2",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/third_party",
+                "${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/host-x86_64-O2",
                 "./"
             ],
-            mplsh="${OUT_ROOT}/aarch64-clang-release/ops/mplsh",
+            mplsh="${OUT_ROOT}/${MAPLE_BUILD_TYPE}/ops/mplsh",
             garbage_collection_kind="RC",
             xbootclasspath="libcore-all.so",
             infile="${APP}.so",
diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh
index d2c8a96d088d229169d08074b53eb46e4f6a26bc..1601de1d647ae5d33ac245272ceb51e2a8ec32db 100755
--- a/tools/setup_tools.sh
+++ b/tools/setup_tools.sh
@@ -49,13 +49,13 @@ if [ "$android_env" == "android" ]; then
     mv android-ndk-r21d android-ndk-r21
     echo Downloaded android ndk.
   fi
-
+  
   if [ ! -L $TOOLS/gcc ]; then
     cd $TOOLS
     ln -s ../android/prebuilts/gcc .
     echo Linked gcc.
   fi
-
+  
   if [ ! -L $TOOLS/clang-r353983c ]; then
     cd $TOOLS
     ln -s ../android/prebuilts/clang/host/linux-x86/clang-r353983c .
@@ -204,3 +204,8 @@ else
   git pull origin master
   cd -
 fi
+
+# prepare scripts for tests
+mkdir -p ${MAPLE_ROOT}/output/script
+cp ${MAPLE_ROOT}/testsuite/driver/script/check.py ${MAPLE_ROOT}/output/script/
+cp ${MAPLE_ROOT}/testsuite/driver/script/kernel.py ${MAPLE_ROOT}/output/script/
\ No newline at end of file