diff --git a/Dockerfile.jenkins b/Dockerfile.jenkins
index 7a8fe82..638bdfa 100644
--- a/Dockerfile.jenkins
+++ b/Dockerfile.jenkins
@@ -1,7 +1,4 @@
-FROM debian:trixie
+FROM schemers/chibi:head
 RUN apt-get update && apt-get install -y \
-    make gcc git ca-certificates libffi-dev docker.io git
-RUN git clone https://github.com/ashinn/chibi-scheme.git
-WORKDIR /chibi-scheme
-RUN make && make install
+    ca-certificates libffi-dev docker.io
 RUN snow-chibi install --impls=chibi retropikzel.test-r7rs
diff --git a/Jenkinsfile b/Jenkinsfile
index e24d718..e5ccb9b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,8 +27,8 @@ pipeline {
     }
 
     environment {
-        R6RS_SCHEMES='chezscheme guile ikarus ironscheme mosh racket sagittarius ypsilon'
-        R7RS_SCHEMES='chibi chicken gauche guile kawa mosh racket sagittarius stklos ypsilon'
+        R6RS_SCHEMES='capyscheme chezscheme ikarus ironscheme mosh racket sagittarius ypsilon'
+        R7RS_SCHEMES='capyscheme chibi chicken gauche kawa mosh racket sagittarius stklos ypsilon'
         LIBRARIES='system named-pipes shell download-file'
     }
 
diff --git a/Makefile b/Makefile
index 6a59d98..9001c02 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ test-docker: testfiles
 		AKKU_PACKAGES="akku-r7rs" \
 		APT_PACKAGES="${APT_PACKAGES}" \
 		PASS_ENV_VARS="CSC_OPTIONS" \
-		test-r7rs -o test-program ${LIB_PATHS} test.${SFX}
+		test-r7rs ${LIB_PATHS} -o test-program test.${SFX}
 
 clean:
 	git clean -X -f