--- a/create-test-environment
+++ b/create-test-environment
@@ -108,16 +108,23 @@ rm -rf $mercurials/@
 cd venv/hg
 hg up @
 make install-bin PREFIX=$mercurials/@
 hg --config extensions.purge= purge --all
 cd ../..
 unset HGRCPATH
 echo finished installing Mercurials
 
+if [ ! -d venv/git-cinnabar ]; then
+  echo "Cloning git-cinnabar"
+  git clone --branch release https://github.com/glandium/git-cinnabar.git venv/git-cinnabar
+fi
+
+git -C venv/git-cinnabar pull
+
 echo ""
 echo "Building Docker images."
 echo "This could take a while and may consume a lot of internet bandwidth."
 echo "If you don't want Docker images, it is safe to hit CTRL+c to abort this."
 
 ./d0cker build-all || {
   echo "You will not be able to run tests that require Docker.";
   echo "Please see https://docs.docker.com/installation/ for how to install Docker.";