diff --git a/.cirrus.yml b/.cirrus.yml
index 4c420593c..8bfbfa557 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -16,12 +16,19 @@ task:
         matrix:
           - USE_MIN_BITCOIN_VERSION: 'TRUE'
           - USE_MIN_BITCOIN_VERSION: 'FALSE'
+          - USE_TAPROOT: 1
     - name: 'RPC functional tests'
       env:
         TEST_GROUP: tests/test_rpc.py
+        matrix:
+          - USE_TAPROOT: 0
+          - USE_TAPROOT: 1
     - name: 'Chain functional tests'
       env:
         TEST_GROUP: tests/test_chain.py
+        matrix:
+          - USE_TAPROOT: 0
+          - USE_TAPROOT: 1
 
   cargo_registry_cache:
     folders: $CARGO_HOME/registry
@@ -34,7 +41,12 @@ task:
     fingerprint_script:
       - rustc --version
       - cat Cargo.lock
-  lianad_build_script: cargo build --release
+  tests_tools_cache:
+    folder: tests/tools/taproot_signer/target
+    fingerprint_script:
+      - rustc --version
+      - cat tests/tools/taproot_signer/Cargo.lock
+  lianad_build_script: cargo build --release && cd tests/tools/taproot_signer && cargo build --release
 
   deps_script: apt update && apt install -y python3 python3-pip