diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 8c33bc9b3a..22441b4805 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -30,7 +30,7 @@ jobs:
           restore-keys: bazel-cache-nightly-${{ runner.os }}-
 
       - name: Install dependencies via apt
-        run: sudo apt-get install python3-distutils python3-dev python-is-python3 libtinfo5  build-essential liblapack-dev libblas-dev gfortran
+        run: sudo apt-get install python3-dev python-is-python3 build-essential liblapack-dev libblas-dev gfortran
 
       - name: Bazel Build Tools (opt)
         run: |
diff --git a/Dockerfile-ubuntu-22.04 b/Dockerfile-ubuntu-22.04
index 2ea4e0bd90..3b7bbb339e 100644
--- a/Dockerfile-ubuntu-22.04
+++ b/Dockerfile-ubuntu-22.04
@@ -23,7 +23,7 @@ RUN chmod +x bazelisk-linux-amd64 && mv bazelisk-linux-amd64 /usr/bin/bazel
 
 
 # Install dependencies
-RUN apt-get -y install python3-distutils python3-dev python-is-python3 libtinfo5  build-essential libxml2-dev liblapack-dev libblas-dev gfortran
+RUN apt-get -y install python3-distutils python3-dev python-is-python3 libtinfo5  build-essential libxml2-dev liblapack-dev libblas-dev gfortran zip
 
 # Install development tools
 RUN apt-get install -y git vim
@@ -36,6 +36,6 @@ ADD --chown=xls-developer . /home/xls-developer/xls/
 WORKDIR /home/xls-developer/xls/
 
 
-# Test everything (opt), exclude xlscc for now due to increased build time when
-# we add Clang.
-RUN bazel test -c opt -- //xls/... -//xls/contrib/xlscc/...
+# Test everything (opt), exclude contrib (including xlscc) for now due to
+# increased build time when we add Clang.
+RUN bazel test -c opt --test_summary=terse --test_verbose_timeout_warnings -- //xls/... -//xls/contrib/... -//xls/dev_tools/...