diff --git a/Makefile b/Makefile
index 04f5ed9a..e118fbd3 100644
--- a/Makefile
+++ b/Makefile
@@ -55,5 +55,16 @@ clean:
 update-project-template:
 	npx update-template https://github.com/googlefonts/googlefonts-project-template/
 
-update:
-	pip install --upgrade $(dependency); pip freeze > requirements.txt
+update: venv venv-test
+	venv/bin/pip install --upgrade pip-tools
+	# See https://pip-tools.readthedocs.io/en/latest/#a-note-on-resolvers for
+	# the `--resolver` flag below.
+	venv/bin/pip-compile --upgrade --verbose --resolver=backtracking requirements.in
+	venv/bin/pip-sync requirements.txt
+
+	venv-test/bin/pip install --upgrade pip-tools
+	venv-test/bin/pip-compile --upgrade --verbose --resolver=backtracking requirements-test.in
+	venv-test/bin/pip-sync requirements-test.txt
+
+	git commit -m "Update requirements" requirements.txt requirements-test.txt
+	git push
diff --git a/requirements-test.in b/requirements-test.in
new file mode 100644
index 00000000..d3260664
--- /dev/null
+++ b/requirements-test.in
@@ -0,0 +1,2 @@
+fontbakery[googlefonts]>=0.9.2
+gftools[qa]>=0.9.23
diff --git a/requirements-test.txt b/requirements-test.txt
index 2d0f9077..161ef17e 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,2 +1,2 @@
-fontbakery[googlefonts]>=0.11.2
-gftools[qa]>=0.9.54
+# Placeholder file, update the requirements by running `make update`.
+-r requirements-test.in
diff --git a/requirements.in b/requirements.in
new file mode 100644
index 00000000..25d651b1
--- /dev/null
+++ b/requirements.in
@@ -0,0 +1,6 @@
+fontmake>=3.9.0
+gftools[qa]>=0.9.54
+drawbot-skia>=0.5.0
+sh>=2.0.6
+bumpfontversion>=0.4.1
+diffenator2>=0.3.8
diff --git a/requirements.txt b/requirements.txt
index 6cad8a15..5dc91024 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,2 @@
-fontmake>=3.9.0
-gftools[qa]>=0.9.54
-drawbot-skia>=0.5.0
-sh>=2.0.6
-bumpfontversion>=0.4.1
-diffenator2>=0.3.8
-
+# Placeholder file, update the requirements by running `make update`.
+-r requirements.in