diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 6bca725..f1a691d 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -2,3 +2,5 @@
 e116d26eeca0891c31b689e43db5bb60b62f73f6
 # Commit that fixed a bunch of uneeded '...' '...' string joins from ^
 fa4225b625654c51c7b0be6efcfd6a1109768a72
+# Commit that added in isort formatting support
+6be0a8133a4fd9e12e6ac3affbdd69555b6c2503
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..d8a2a3d
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,12 @@
+[tool.black]
+line-length=80
+skip-string-normalization=true
+skip-magic-trailing-comma=true
+
+[tool.isort]
+profile = "black"
+known_first_party="octodns"
+line_length=80
+
+[tool.pytest.ini_options]
+pythonpath = "."
diff --git a/requirements-dev.txt b/requirements-dev.txt
index c0d73db..6573491 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -14,6 +14,7 @@ docutils==0.19
 exceptiongroup==1.0.0
 importlib-metadata==5.0.0
 iniconfig==1.1.1
+isort==5.11.4
 jaraco.classes==3.2.3
 keyring==23.9.3
 more-itertools==9.0.0
diff --git a/script/coverage b/script/coverage
index b8afafd..914a042 100755
--- a/script/coverage
+++ b/script/coverage
@@ -38,8 +38,6 @@ grep -r -I --line-number "# pragma: +no.*cover" $SOURCE_DIR && {
     exit 1
 }
 
-export PYTHONPATH=.:$PYTHONPATH
-
 pytest \
   --disable-network \
   --cov-reset \
diff --git a/script/format b/script/format
index 51ad3b9..1e9fe4f 100755
--- a/script/format
+++ b/script/format
@@ -6,4 +6,5 @@ SOURCES=$(find *.py octodns tests -name "*.py")
 
 . env/bin/activate
 
-black --line-length=80 --skip-string-normalization --skip-magic-trailing-comma "$@" $SOURCES
+isort "$@" $SOURCES
+black "$@" $SOURCES
diff --git a/script/test b/script/test
index 7015111..f5e4d8e 100755
--- a/script/test
+++ b/script/test
@@ -30,6 +30,4 @@ export ARM_CLIENT_SECRET=
 export ARM_TENANT_ID=
 export ARM_SUBSCRIPTION_ID=
 
-export PYTHONPATH=.:$PYTHONPATH
-
 pytest --disable-network "$@"
diff --git a/setup.py b/setup.py
index 9d29062..e6d97e5 100644
--- a/setup.py
+++ b/setup.py
@@ -74,6 +74,7 @@ setup(
         + (
             'black>=22.3.0',
             'build>=0.7.0',
+            'isort>=5.11.4',
             'pycountry>=19.8.18',
             'pycountry-convert>=0.7.2',
             'pyflakes>=2.2.0',