diff --git a/noxfile.py b/noxfile.py
index 24f82c0..6252ab0 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -32,7 +32,11 @@ def docs(session):
 def venv(session):
     session.install("-r", "requirements.txt")
     session.install("-r", "test-requirements.txt")
-    session.install("-e", ".")
+    # TODO: clean this conditional up once Python 3.6 support is dropped
+    if session.python == "3.6":
+        session.install(".")
+    else:
+        session.install("-e", ".")
     session.run(*session.posargs)
 
 
@@ -41,7 +45,11 @@ def venv(session):
 def tests(session):
     session.install("-r", "requirements.txt")
     session.install("-r", "test-requirements.txt")
-    session.install("-e", ".")
+    # TODO: clean this conditional up once Python 3.6 support is dropped
+    if session.python == "3.6":
+        session.install(".")
+    else:
+        session.install("-e", ".")
     session.run("stestr", "run", *session.posargs)
     session.run("stestr", "slowest")
 
@@ -50,7 +58,11 @@ def tests(session):
 def cover(session):
     session.install("-r", "requirements.txt")
     session.install("-r", "test-requirements.txt")
-    session.install("-e", ".")
+    # TODO: clean this conditional up once Python 3.6 support is dropped
+    if session.python == "3.6":
+        session.install(".")
+    else:
+        session.install("-e", ".")
     session.env["PYTHON"] = "coverage run --source bindep --parallel-mode"
     session.run("stestr", "run", *session.posargs)
     session.run("stestr", "slowest")
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..2a38d6b
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["pbr>=6.1.1"]
+build-backend = "pbr.build"
diff --git a/setup.cfg b/setup.cfg
index d6c4bdd..25bda33 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -42,8 +42,8 @@ classifier =
     Topic :: Utilities
 python_requires = >=3.6
 
-[files]
-packages = bindep
+[options]
+py_modules = bindep
 
 [pbr]
 warnerrors = True
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index c0a24ea..321e09e
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# TODO: Delete this file once PBR gains the ability to act as a build hook
+
 import setuptools
 
-setuptools.setup(
-    setup_requires=['pbr'],
-    pbr=True)
+setuptools.setup(pbr=True)