diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b9534ec101..87d740e2b0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ docker build -t frankenphp-dev -f dev.Dockerfile .
 docker run --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -p 8080:8080 -p 443:443 -p 443:443/udp -v $PWD:/go/src/app -it frankenphp-dev
 ```
 
-The image contains the usual development tools (Go, GDB, Valgrind, Neovim...) and uses the following php setting locations
+The image contains the usual development tools (Go, GDB, Valgrind...) and uses the following php setting locations
 
 - php.ini: `/etc/frankenphp/php.ini` A php.ini file with development presets is provided by default.
 - additional configuration files: `/etc/frankenphp/php.d/*.ini`
diff --git a/dev-alpine.Dockerfile b/dev-alpine.Dockerfile
index b3b63c1e31..90dbd4816c 100644
--- a/dev-alpine.Dockerfile
+++ b/dev-alpine.Dockerfile
@@ -36,14 +36,13 @@ RUN apk add --no-cache \
 	libstdc++ \
 	linux-headers \
 	# Dev tools \
+	bash \
 	git \
 	clang \
 	cmake \
 	llvm \
 	gdb \
 	valgrind \
-	neovim \
-	zsh \
 	libtool && \
 	echo 'set auto-load safe-path /' > /root/.gdbinit
 
@@ -78,8 +77,11 @@ RUN git clone https://github.com/e-dant/watcher . && \
 WORKDIR /go/src/app
 COPY . .
 
+# Cache test dependencies too, so tests run offline
+RUN go mod download && go -C caddy mod download
+
 WORKDIR /go/src/app/caddy/frankenphp
 RUN ../../go.sh build -buildvcs=false
 
 WORKDIR /go/src/app
-CMD [ "zsh" ]
+CMD [ "bash" ]
diff --git a/dev.Dockerfile b/dev.Dockerfile
index d6ee769e88..1a7072c099 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -41,8 +41,6 @@ RUN apt-get update && \
 	llvm \
 	gdb \
 	valgrind \
-	neovim \
-	zsh \
 	libtool-bin && \
 	echo 'set auto-load safe-path /' > /root/.gdbinit && \
 	echo '* soft core unlimited' >> /etc/security/limits.conf \
@@ -82,8 +80,11 @@ RUN git clone https://github.com/e-dant/watcher . && \
 WORKDIR /go/src/app
 COPY --link . ./
 
+# Cache test dependencies too, so tests run offline
+RUN go mod download && go -C caddy mod download
+
 WORKDIR /go/src/app/caddy/frankenphp
 RUN ../../go.sh build -buildvcs=false
 
 WORKDIR /go/src/app
-CMD [ "zsh" ]
+CMD [ "bash" ]