diff --git a/.circleci/config.yml b/.circleci/config.yml
index d28557a..8832e7a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,10 +18,15 @@ jobs:
     steps:
       - checkout
 
+      # Get bitcoin_sandbox
+      - run:
+          name: get bitcoin_sandbox
+          command: git clone --single-branch --branch ln https://github.com/sr-gi/bitcoin_sandbox.git
+
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v2-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}
+            - v2-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}-{{ checksum "bitcoin_sandbox/requirements.txt" }}
             # fallback to using the latest cache if no exact match is found
             - v2-dependencies-
 
@@ -35,22 +40,21 @@ jobs:
             pip install -r pisa/requirements.txt
             pip install -r pisa/requirements-dev.txt
             pip install -r apps/cli/requirements-dev.txt
+            pip install -r bitcoin_sandbox/requirements.txt
 
       - save_cache:
           paths:
             - ./venv
-          key: v2-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}
+          key: v2-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}-{{ checksum "bitcoin_sandbox/requirements.txt" }}
 
       # Build docker env for E2E testing
       - run:
           name: build bitcoin_sandbox
           command: |
-            git clone --single-branch --branch ln https://github.com/sr-gi/bitcoin_sandbox.git
-            . venv/bin/activate
-            pip install -r bitcoin_sandbox/requirements.txt
             cp test/pisa/e2e/bitcoin.conf bitcoin_sandbox/
             cp test/pisa/e2e/conf.py bitcoin_sandbox/bitcoin_sandbox/
-            cd bitcoin_sandbox && python3 bitcoin_sandbox/run_scenarios.py
+            . venv/bin/activate
+            cd bitcoin_sandbox && python -m bitcoin_sandbox.run_scenarios
 
 
       # Run unit tests