diff --git a/.circleci/config.yml b/.circleci/config.yml
index a4233d29..53e64ab9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -46,6 +46,20 @@ jobs:
           name: Configure URL in /etc/hosts
           command: echo 127.0.0.1 ${CIRCLE_PROJECT_REPONAME}.local | sudo tee -a /etc/hosts
 
+      # Note: phing and drupal-check have mutually exclusive requirements.
+      # It'd be better to add drupal-check as a dependency of the drupal project
+      # rather than as part of the virtual environment, but this will have to do
+      # for now. Also note, drupal-check is added as part of the-vagrant so it
+      # is available to run within our VM.
+      # Note 2: drupal-check is pinned to a known stable version.
+      - run:
+          name: Install drupal-check
+          command: |
+            curl -O -L https://github.com/mglaman/drupal-check/releases/download/1.0.9/drupal-check.phar
+            mkdir --parents ~/bin
+            mv drupal-check.phar ~/bin/drupal-check
+            chmod +x ~/bin/drupal-check
+
       # Composer package cache
       - restore_cache:
           keys:
@@ -76,16 +90,6 @@ jobs:
           paths:
             - ".git"
 
-
-      # Composer package cache - update when the contents of the Composer cache directory
-      # change
-      - run: ls -1R ~/.composer/cache/ > /tmp/composer-cache.txt
-      - save_cache:
-          key: composer-v1-{{ checksum "/tmp/composer-cache.txt" }}
-          paths:
-              - ~/.composer
-
-
       # Install the-build
       - run:
           name: Install the-build in the project
@@ -101,6 +105,15 @@ jobs:
           name: Install Drupal
           command: printf 'y' | vendor/bin/phing install -Ddrupal.validate_clean_config.bypass=yes
 
+      # Composer package cache - update when the contents of the Composer cache directory
+      # change. This cache is saved after installing Drupal, as the install process uses
+      # composer to add a few modules.
+      - run: ls -1R ~/.composer/cache/ > /tmp/composer-cache.txt
+      - save_cache:
+          key: composer-v1-{{ checksum "/tmp/composer-cache.txt" }}
+          paths:
+              - ~/.composer
+
       # Add a multisite
       - run:
           name: Add a multisite to the project
diff --git a/defaults/install/.circleci/config.yml b/defaults/install/.circleci/config.yml
index ff29de60..91447774 100644
--- a/defaults/install/.circleci/config.yml
+++ b/defaults/install/.circleci/config.yml
@@ -48,6 +48,7 @@ jobs:
       # rather than as part of the virtual environment, but this will have to do
       # for now. Also note, drupal-check is added as part of the-vagrant so it
       # is available to run within our VM.
+      # Note 2: drupal-check is pinned to a known stable version.
       - run:
           name: Install drupal-check
           command: |