diff --git a/Dockerfile.test b/Dockerfile.test
index c303fad..9974b34 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -40,7 +40,9 @@ RUN akku update
 RUN akku install chez-srfi akku-r7rs "(foreign c)"
 WORKDIR /workdir
 RUN mkdir -p srfi
-RUN for srfi in 60 64 145 180; do cp /build/r7rs-srfi/srfi/${srfi}.* srfi/ && cp /build/r7rs-srfi/srfi/srfi-${srfi}.* srfi/; done
+RUN for srfi in 60 64 180; do cp /build/r7rs-srfi/srfi/${srfi}.* srfi/ && cp /build/r7rs-srfi/srfi/srfi-${srfi}.* srfi/; done
+RUN mkdir -p libs/srfi
+RUN for srfi in 60 64 145 180; do cp /build/r7rs-srfi/srfi/${srfi}.* srfi/ && cp /build/r7rs-srfi/srfi/srfi-${srfi}.* libs/srfi/; done
 RUN if [ "${SCHEME}" = "skint" ]; then cp -r /build/r7rs-srfi/srfi/39.* srfi/; fi
 RUN if [ "${SCHEME}" = "tr7" ]; then cp -r /build/r7rs-srfi/srfi/39.* srfi/; fi
 COPY Makefile .
diff --git a/Makefile b/Makefile
index 03c342d..47e0366 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ test-r6rs-docker: ${TMPDIR}
 test-r7rs: ${TMPDIR}
 	cd ${TMPDIR} && echo "(import (scheme base) (scheme write) (scheme read) (scheme char) (scheme file) (scheme process-context) (srfi 64) (retropikzel ${LIBRARY}))" > test-r7rs.scm
 	cat ${TESTFILE} >> ${TMPDIR}/test-r7rs.scm
-	cd ${TMPDIR} && COMPILE_R7RS=${SCHEME} timeout 60 compile-scheme -I . -o test-r7rs test-r7rs.scm
+	cd ${TMPDIR} && COMPILE_R7RS=${SCHEME} timeout 60 compile-scheme -I ./libs -o test-r7rs test-r7rs.scm
 	cd ${TMPDIR} && timeout 60 ./test-r7rs
 
 test-r7rs-docker: ${TMPDIR}