diff --git a/drupal/rootfs/etc/s6-overlay/scripts/install.sh b/drupal/rootfs/etc/s6-overlay/scripts/install.sh
index 43f02a4..133af52 100755
--- a/drupal/rootfs/etc/s6-overlay/scripts/install.sh
+++ b/drupal/rootfs/etc/s6-overlay/scripts/install.sh
@@ -8,6 +8,11 @@ source /etc/islandora/utilities.sh
 readonly SITE="default"
 
 function configure {
+    # Work around for when the cache is in a bad state, as Drush will access
+    # the cache before rebuilding it for some dumb reason, preventing
+    # Drush from being able to clear it.
+    local params=$(/var/www/drupal/web/core/scripts/rebuild_token_calculator.sh 2>/dev/null)
+    curl -L "${DRUPAL_DRUSH_URI}/core/rebuild.php?${params}"
     # Starter site post install steps.
     drush --root=/var/www/drupal --uri="${DRUPAL_DRUSH_URI}" cache:rebuild
     drush --root=/var/www/drupal --uri="${DRUPAL_DRUSH_URI}" user:role:add fedoraadmin admin
diff --git a/tests/init-template-starter.sh b/tests/init-template-starter.sh
index b5e1fde..7f8b11f 100755
--- a/tests/init-template-starter.sh
+++ b/tests/init-template-starter.sh
@@ -25,6 +25,9 @@ cp ./tests/solr.php drupal/rootfs/var/www/drupal/
 
 docker compose --profile dev up -d
 
+echo "Waiting for installation..."
+docker compose  --profile dev exec drupal-dev timeout 600 bash -c "while ! test -f /installed; do sleep 5; done"
+
 ./tests/ping.sh
 
 docker compose --profile dev exec drupal-dev drush scr solr.php