diff --git a/.github/workflows/ci-image-test.yml b/.github/workflows/ci-image-test.yml
index d5e91d9da..e0f7e4d9f 100644
--- a/.github/workflows/ci-image-test.yml
+++ b/.github/workflows/ci-image-test.yml
@@ -47,13 +47,13 @@ jobs:
       shell: bash
     - name: Run make test
       run: |
-        docker run --rm -i scilla:tests bash -c 'cd /scilla/0 && eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make test'
+        docker run --rm -i scilla:tests bash -c 'eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make test'
       shell: bash
     - name: Run make test_server
       run: |
-        docker run --rm -i scilla:tests bash -c 'cd /scilla/0 && eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make test_server'
+        docker run --rm -i scilla:tests bash -c 'eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make test_server'
       shell: bash
     - name: Run make lint
       run: |
-        docker run --rm -i scilla:tests bash -c 'cd /scilla/0 && eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make lint'
+        docker run --rm -i scilla:tests bash -c 'eval $(opam env) && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib make lint'
       shell: bash
diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test
index 2bf8d28ea..a7b305130 100644
--- a/docker/Dockerfile.test
+++ b/docker/Dockerfile.test
@@ -3,13 +3,13 @@ FROM 648273915458.dkr.ecr.us-west-2.amazonaws.com/scilla:429e2f9
 ENV VCPKG_ROOT="/vcpkg"
 ENV SCILLA_REPO_ROOT="/scilla/0"
 
+WORKDIR /scilla/0/
 COPY . /scilla/0/
 
 RUN apt-get update -y \
   && apt install -y sudo
 
-RUN cd /scilla/0 \
-  && eval $(opam env) \
+RUN eval $(opam env) \
   && LD_LIBRARY_PATH=/scilla/0/vcpkg_installed/x64-linux-dynamic/lib opam install reason.3.8.2 --yes
 
 RUN ./scripts/install_shellcheck_ubuntu.sh