diff --git a/scripts/format b/scripts/format
index e1875d083..7883845ed 100755
--- a/scripts/format
+++ b/scripts/format
@@ -4,11 +4,11 @@ if [ "" == "$1" ] ; then
     files=`git ls-files '*.cpp' '*.cc' '*.hpp' '*.hh' '*.tcc'`
     for f in $files ; do
         echo "FORMATTING $f"
-        clang-format-8 -style=file -i $f
+        clang-format -style=file -i $f
     done
 else
     for f in $@ ; do
         echo "FORMATTING $f"
-        clang-format-8 -style=file -i $f
+        clang-format -style=file -i $f
     done
 fi
diff --git a/testdata/mpc_phase2_server_config.json b/testdata/mpc_phase2_server_config.json
index 33b08085e..0900dbbf4 100644
--- a/testdata/mpc_phase2_server_config.json
+++ b/testdata/mpc_phase2_server_config.json
@@ -10,5 +10,5 @@
         "tls_certificate": "cert.pem",
         "port": PORT
     },
-    "mpc_tool": "../build/src/mpc/mpc-test"
+    "mpc_tool": "../build/mpc_tools/mpc_phase2/mpc-test-phase2"
 }