diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index de2048e3..a58ce54c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Byte compilation
       run: emacs --eval "(setq byte-compile-error-on-warn (>= emacs-major-version 26))" -L . --batch -f batch-byte-compile ./*.el
     - name: Tests
-      run: nix shell ${{ matrix.ledger_version || 'nixpkgs#ledger' }} --print-build-logs -c ./makem.sh test -vv --compile-batch
+      run: nix shell ${{ matrix.ledger_version || 'nixpkgs#ledger' }} --print-build-logs -c ./makem.sh test -vv
     # This is currently for information only, since a lot of docstrings need fixing up
     - name: Checkdoc
       run: make lint-checkdoc || true
diff --git a/ledger-mode.el b/ledger-mode.el
index cbebbd74..889ed949 100644
--- a/ledger-mode.el
+++ b/ledger-mode.el
@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'subr-x))                    ;for `when-let' in Emacs <26
 (require 'ledger-regex)
 (require 'org)
 (require 'ledger-commodities)
diff --git a/ledger-occur.el b/ledger-occur.el
index 7bda973f..cf820225 100644
--- a/ledger-occur.el
+++ b/ledger-occur.el
@@ -30,6 +30,8 @@
 ;;; Code:
 
 (require 'cl-lib)
+(eval-when-compile
+  (require 'subr-x))                    ;for `when-let' in Emacs <26
 (require 'ledger-navigate)
 
 (defconst ledger-occur-overlay-property-name 'ledger-occur-custom-buffer-grep)
diff --git a/ledger-post.el b/ledger-post.el
index dd063e8f..9cd9b253 100644
--- a/ledger-post.el
+++ b/ledger-post.el
@@ -23,6 +23,8 @@
 ;;; Commentary:
 ;; Utility functions for dealing with postings.
 
+(eval-when-compile
+  (require 'subr-x)) ;for `when-let', `string-empty-p', `string-trim' in Emacs <26
 (require 'ledger-regex)
 (require 'ledger-navigate)
 
diff --git a/ledger-reconcile.el b/ledger-reconcile.el
index db5cf126..eb8d1106 100644
--- a/ledger-reconcile.el
+++ b/ledger-reconcile.el
@@ -27,6 +27,8 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'subr-x))                    ;`if-let', `when-let' in Emacs <26
 (require 'easymenu)
 (require 'ledger-init)
 
diff --git a/ledger-xact.el b/ledger-xact.el
index a2b870e7..bcc9011d 100644
--- a/ledger-xact.el
+++ b/ledger-xact.el
@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'subr-x))                    ;`if-let', `when-let' in Emacs <26
 (require 'eshell)
 (require 'ledger-regex)
 (require 'ledger-navigate)