diff --git a/stack_orchestrator/data/compose/docker-compose-fixturenet-laconicd.yml b/stack_orchestrator/data/compose/docker-compose-fixturenet-laconicd.yml
index f3025062..7821f6ea 100644
--- a/stack_orchestrator/data/compose/docker-compose-fixturenet-laconicd.yml
+++ b/stack_orchestrator/data/compose/docker-compose-fixturenet-laconicd.yml
@@ -28,6 +28,7 @@ services:
     image: cerc/laconic-registry-cli:local
     volumes:
       - ../config/fixturenet-laconicd/registry-cli-config-template.yml:/registry-cli-config-template.yml
+      - ${BASE_DIR}/laconic-registry-cli:/laconic-registry-cli
 
 volumes:
   laconicd-data:
diff --git a/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/Dockerfile b/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/Dockerfile
index 94d2d7e3..8ff8ab7e 100644
--- a/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/Dockerfile
+++ b/stack_orchestrator/data/container-build/cerc-laconic-registry-cli/Dockerfile
@@ -52,10 +52,6 @@ RUN npm config set @cerc-io:registry ${CERC_NPM_REGISTRY_URL} \
 # Globally install the cli package
 RUN yarn global add @cerc-io/laconic-registry-cli
 
-# Clone the repo for running CLI tests inside the container
-RUN git clone https://git.vdb.to/cerc-io/laconic-registry-cli.git \
-    && cd laconic-registry-cli && yarn
-
 # Add scripts
 RUN mkdir /scripts
 RUN mkdir /scripts/demo-records
diff --git a/tests/fixturenet-laconicd/run-cli-test.sh b/tests/fixturenet-laconicd/run-cli-test.sh
index 0ff01de9..3eac56f9 100755
--- a/tests/fixturenet-laconicd/run-cli-test.sh
+++ b/tests/fixturenet-laconicd/run-cli-test.sh
@@ -12,7 +12,7 @@ cat /etc/hosts
 TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 )
 
 echo "$(date +"%Y-%m-%d %T"): Starting stack"
-TEST_AUCTION_ENABLED=true $TEST_TARGET_SO --stack fixturenet-laconicd deploy --cluster laconicd up
+TEST_AUCTION_ENABLED=true BASE_DIR=~/cerc $TEST_TARGET_SO --stack fixturenet-laconicd deploy --cluster laconicd up
 echo "$(date +"%Y-%m-%d %T"): Stack started"
 
 # Verify that the fixturenet is up and running
@@ -30,7 +30,7 @@ docker exec laconicd-laconicd-1 sh -c "curl --retry 10 --retry-delay 3 --retry-c
 
 # Run the tests
 echo "Running the tests"
-docker exec -e TEST_ACCOUNT=$laconicd_account_address laconicd-cli-1 sh -c 'cd laconic-registry-cli && yarn test'
+docker exec -e TEST_ACCOUNT=$laconicd_account_address laconicd-cli-1 sh -c 'cd laconic-registry-cli && yarn && yarn test'
 
 # Clean up
 $TEST_TARGET_SO --stack fixturenet-laconicd deploy --cluster laconicd down --delete-volumes