diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 8d7113079a..9332fc1d84 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -36,6 +36,9 @@ python3.6 -m pip uninstall --yes --quiet nox-automation
 python3.6 -m pip install --upgrade --quiet nox
 python3.6 -m nox --version
 
+python3.6 -m venv env
+source env/bin/activate
+
 # If NOX_SESSION is set, it only runs the specified session,
 # otherwise run all the sessions.
 if [[ -n "${NOX_SESSION:-}" ]]; then
@@ -57,7 +60,7 @@ pip3 install .
 # Create a unique DJANGO_TESTS_DIR per worker to avoid
 # any clashes with configured tests by other workers.
 export DJANGO_TESTS_DIR="django_tests_$DJANGO_WORKER_INDEX"
-mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch spanner-2.2.x https://github.com/timgraham/django.git $DJANGO_TESTS_DIR/django
+mkdir -p $DJANGO_TESTS_DIR && git clone --depth 1 --single-branch --branch stable/2.2.x https://github.com/django/django.git $DJANGO_TESTS_DIR/django
 
 # Install dependencies for Django tests.
 sudo apt-get update
diff --git a/commitlint.config.js b/commitlint.config.js
new file mode 100644
index 0000000000..28fe5c5bf9
--- /dev/null
+++ b/commitlint.config.js
@@ -0,0 +1 @@
+module.exports = {extends: ['@commitlint/config-conventional']}