diff --git a/.circleci/config.yml b/.circleci/config.yml
index ee75d5eb8..66e02ce36 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,7 +1,7 @@
 # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
 defaults: &defaults
   docker:
-    - image: quay.io/pantheon-public/build-tools-ci:1.x
+    - image: quay.io/pantheon-public/build-tools-ci:2.x
   working_directory: ~/example_drops_8_composer
   environment:
     #=========================================================================
diff --git a/tests/scripts/run-behat b/tests/scripts/run-behat
index a4aa79933..7e76fc07d 100755
--- a/tests/scripts/run-behat
+++ b/tests/scripts/run-behat
@@ -21,7 +21,9 @@ set -ex
 PATH=$PATH:~/.composer/vendor/bin
 
 # Create a drush alias file so that Behat tests can be executed against Pantheon.
-terminus aliases
+terminus alpha:aliases --no-db-url --only=$TERMINUS_SITE
+drush sa @pantheon.$TERMINUS_SITE.$TERMINUS_ENV
+
 # Drush Behat driver fails without this option.
 echo "\$options['strict'] = 0;" >> ~/.drush/pantheon.aliases.drushrc.php