diff --git a/.circleci/config.yml b/.circleci/config.yml
index d867a71ccb..c7611ad7ff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -289,7 +289,7 @@ jobs:
     docker:
       - image: gcr.io/cloud-builders/docker
     steps:
-      - run: apt-get install -y make virtualenv python-pip
+      - run: apt-get install -y make virtualenv python-pip enchant
       - checkout
       - setup_remote_docker
       - run: make ci-deb-tests
@@ -305,6 +305,7 @@ workflows:
               ignore:
                 - /docs-.*/
                 - /i18n-.*/
+                - /update-builder-.*/
           requires:
             - lint
       - python3-app-tests:
@@ -313,6 +314,7 @@ workflows:
               ignore:
                 - /docs-.*/
                 - /i18n-.*/
+                - /update-builder-.*/
           requires:
             - lint
       - admin-tests:
@@ -321,6 +323,7 @@ workflows:
               ignore:
                 - /docs-.*/
                 - /i18n-.*/
+                - /update-builder-.*/
           requires:
             - lint
       - fetch-tor-debs:
@@ -329,6 +332,7 @@ workflows:
               ignore:
                 - /docs-.*/
                 - /i18n-.*/
+                - /update-builder-.*/
           requires:
             - lint
       - updater-gui-tests:
@@ -337,6 +341,7 @@ workflows:
               ignore:
                 - /docs-.*/
                 - /i18n-.*/
+                - /update-builder-.*/
           requires:
             - lint
       - static-analysis-and-no-known-cves:
diff --git a/devops/scripts/test-built-packages.sh b/devops/scripts/test-built-packages.sh
index 98a6daf1fe..fbdd433245 100755
--- a/devops/scripts/test-built-packages.sh
+++ b/devops/scripts/test-built-packages.sh
@@ -11,4 +11,4 @@ set -o pipefail
 
 virtualenv_bootstrap
 
-make build-debs
+molecule test -s builder-xenial
diff --git a/molecule/builder-xenial/image_hash b/molecule/builder-xenial/image_hash
index 2ecf5ec2ea..bf710c4df0 100644
--- a/molecule/builder-xenial/image_hash
+++ b/molecule/builder-xenial/image_hash
@@ -1,2 +1,2 @@
-# sha256 digest quay.io/freedomofpress/sd-docker-builder-xenial:2019_05_15
-20c4aa2c6a01a135379ff439ae439ce0ad80ec9e41db8c2b242f54310c536a92
+# sha256 digest quay.io/freedomofpress/sd-docker-builder-xenial:2019_05_31
+93cc5792cd73f1c6499866d9ab3c246c798ef77c434a4853637ad11ecaf5ead7