diff --git a/scripts/format-imports.sh b/scripts/format-imports.sh
new file mode 100755
index 000000000..cfa66bbd4
--- /dev/null
+++ b/scripts/format-imports.sh
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+set -x
+
+# Sort imports one per line, so autoflake can remove unused imports
+isort --recursive  --force-single-line-imports --thirdparty fastapi --apply fastapi tests docs/src
+sh ./scripts/format.sh