diff --git a/Makefile b/Makefile
index 9d10216..6c52fe1 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ test: tmp/test/libtest.o tmp/test/libtest.so tmp/test/libtest.a
 		COMPILE_R7RS_CHICKEN="-L -ltest -I. -L." \
 		COMPILE_R7RS_KAWA="-J--add-exports=java.base/jdk.internal.foreign.abi=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign.layout=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED -J--enable-native-access=ALL-UNNAMED -J--enable-preview" \
 		COMPILE_R7RS=${SCHEME} \
-		compile-r7rs -I . -o ${TEST} ${TEST}.scm
+		compile-r7rs -I . -I /usr/local/share/kawa/lib -o ${TEST} ${TEST}.scm
 	cd tmp/test && ./${TEST}
 
 test-compile-r7rs-snow: tmp/test/libtest.o tmp/test/libtest.so tmp/test/libtest.a
@@ -62,7 +62,7 @@ test-compile-r7rs-wine:
 		LD_LIBRARY_PATH=. \
 		wine ./${TEST}.bat
 
-test-compile-r7rs-docker:
+test-docker:
 	docker build --build-arg COMPILE_R7RS=${SCHEME} --tag=r7rs-pffi-test-${SCHEME} -f dockerfiles/Dockerfile.test .
 	docker run -it -v "${PWD}:/workdir" -w /workdir -t r7rs-pffi-test-${SCHEME} sh -c "make COMPILE_R7RS=${SCHEME} TEST=${TEST} test-compile-r7rs"
 
diff --git a/dockerfiles/Dockerfile.snow-chibi-install-test b/dockerfiles/Dockerfile.snow-chibi-install-test
index 43fcd69..9e315e7 100644
--- a/dockerfiles/Dockerfile.snow-chibi-install-test
+++ b/dockerfiles/Dockerfile.snow-chibi-install-test
@@ -1,4 +1,4 @@
-ARG COMPILE_R7RS=chibi
+ARG SCHEME=chibi
 FROM schemers/${COMPILE_R7RS}
 RUN apt-get update && apt-get install -y \
     build-essential \
@@ -15,11 +15,11 @@ RUN apt-get update && apt-get install -y \
     pandoc \
     weasyprint \
     chicken-bin
-RUN git clone https://github.com/Retropikzel/chibi-scheme.git --branch=snow-chibi-foreign-depends
+RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
 RUN cd chibi-scheme && make && make install
 RUN chicken-install r7rs
 RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
 RUN cd compile-r7rs && make && make install
-ARG COMPILE_R7RS=chibi
-ENV COMPILE_R7RS=${COMPILE_R7RS}
+ARG SCHEME=chibi
+ENV COMPILE_R7RS=${SCHEME}