diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index d7dbc99..5d11c03 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -12,7 +12,7 @@ on:
 
 defaults:
   run:
-    shell: bash -l {0}
+    shell: bash -leo pipefail {0}
 
 jobs:
   test:
diff --git a/.github/workflows/canary.yaml b/.github/workflows/canary.yaml
index 94a3bd0..96a56a0 100644
--- a/.github/workflows/canary.yaml
+++ b/.github/workflows/canary.yaml
@@ -8,6 +8,10 @@ on:
     branches:
       - "main"
 
+defaults:
+  run:
+    shell: bash -leo pipefail {0}
+
 jobs:
   test:
     name: Canary tests on ${{ matrix.cfg.os }}, Python ${{ matrix.python-version }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3eb4f62..bb36538 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
   - id: trailing-whitespace
   - id: debug-statements
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.15.14
+  rev: v0.15.15
   hooks:
     - id: ruff
     - id: ruff-format
diff --git a/devtools/conda-envs/test_env.yaml b/devtools/conda-envs/test_env.yaml
index d315d48..7e85b83 100644
--- a/devtools/conda-envs/test_env.yaml
+++ b/devtools/conda-envs/test_env.yaml
@@ -5,6 +5,7 @@ dependencies:
   - python
   - pip
   - openff-toolkit >=0.17.0
+  - ambertools >=22
   - openff-interchange >=0.3.17
   - pytest
   - pytest-cov