diff --git a/runtime/tools/ffi/sdk_lib_ffi_generator.dart b/runtime/tools/ffi/sdk_lib_ffi_generator.dart
index 4b926b5..3b68036 100644
--- a/runtime/tools/ffi/sdk_lib_ffi_generator.dart
+++ b/runtime/tools/ffi/sdk_lib_ffi_generator.dart
@@ -51,7 +51,7 @@
 
   final fullPath = path.resolve(fileName).path;
   File(fullPath).writeAsStringSync(buffer.toString());
-  final fmtResult = Process.runSync(dartfmtPath().path, ["-w", fullPath]);
+  final fmtResult = Process.runSync(dartPath().path, ["format", fullPath]);
   if (fmtResult.exitCode != 0) {
     throw Exception(
         "Formatting failed:\n${fmtResult.stdout}\n${fmtResult.stderr}\n");
@@ -326,10 +326,10 @@
   return parser;
 }
 
-Uri dartfmtPath() {
-  // TODO(dacoharkes): Use "../../../tools/sdks/dart-sdk/bin/dartfmt" when the
+Uri dartPath() {
+  // TODO(dacoharkes): Use "../../../tools/sdks/dart-sdk/bin/dart" when the
   // pinned fully supports extension methods.
-  return Uri.parse("dartfmt");
+  return Uri.parse("dart");
 }
 
 class Config {
diff --git a/tests/ffi/generator/structs_by_value_tests_generator.dart b/tests/ffi/generator/structs_by_value_tests_generator.dart
index 03df491..f030b93 100644
--- a/tests/ffi/generator/structs_by_value_tests_generator.dart
+++ b/tests/ffi/generator/structs_by_value_tests_generator.dart
@@ -909,7 +909,7 @@
 
     final path = callTestPath(nnbd);
     File(path).writeAsStringSync(buffer.toString());
-    Process.runSync("dartfmt", ["-w", path]);
+    Process.runSync("dart", ["format", path]);
   }
 }
 
@@ -975,7 +975,7 @@
 
     final path = callbackTestPath(nnbd);
     File(path).writeAsStringSync(buffer.toString());
-    Process.runSync("dartfmt", ["-w", path]);
+    Process.runSync("dart", ["format", path]);
   }
 }
 
diff --git a/tools/VERSION b/tools/VERSION
index d744ad1..c71b57b 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 15
 PATCH 0
-PRERELEASE 170
+PRERELEASE 171
 PRERELEASE_PATCH 0
\ No newline at end of file
