diff --git a/playbooks/system-test.yaml b/playbooks/system-test.yaml
index 5f9bd27..6660e12 100644
--- a/playbooks/system-test.yaml
+++ b/playbooks/system-test.yaml
@@ -5,13 +5,18 @@
     toolbox_bin: '/usr/local/bin/toolbox'
 
   tasks:
-    - name: Build toolbox
+    - name: Set up build directory
       command: meson builddir
       args:
         chdir: '{{ zuul.project.src_dir }}'
+
+    - name: Build Toolbox
+      command: ninja -C builddir
+      args:
+        chdir: '{{ zuul.project.src_dir }}'
         creates: builddir/src/toolbox
 
-    - name: Install toolbox
+    - name: Install Toolbox
       become: yes
       command: ninja -C builddir install
       args:
diff --git a/playbooks/unit-test.yaml b/playbooks/unit-test.yaml
index 444c391..9be98e7 100644
--- a/playbooks/unit-test.yaml
+++ b/playbooks/unit-test.yaml
@@ -11,11 +11,17 @@
           - meson
           - ShellCheck
 
-    - name: Build
+    - name: Set up build directory
       command: meson builddir
       args:
         chdir: '{{ zuul.project.src_dir }}'
 
+    - name: Build Toolbox
+      command: ninja -C builddir
+      args:
+        chdir: '{{ zuul.project.src_dir }}'
+        creates: builddir/src/toolbox
+
     - name: Test
       command: ninja -C builddir test
       args: