diff --git a/Dockerfile.test b/Dockerfile.test
index f262fe1..a7c0222 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -39,11 +39,8 @@ ENV PATH=/root/.local/bin:${PATH}
 RUN akku update
 WORKDIR /workdir
 RUN mkdir -p srfi
-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 39 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}" = "chibi" ]; then rm -rf .libs/srfi/39.*; fi
+RUN for srfi in 39 60 64 180; do cp /build/r7rs-srfi/srfi/${srfi}.* srfi/ && cp /build/r7rs-srfi/srfi/srfi-${srfi}.* srfi/; done
+RUN if [ "${SCHEME}" = "chibi" ]; then rm -rf srfi/39.*; fi
 COPY Makefile .
 COPY retropikzel retropikzel/
-COPY retropikzel libs/retropikzel/
 
diff --git a/Makefile b/Makefile
index 0d16a2f..b39a113 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,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 120 compile-scheme -I ./libs -o test-r7rs test-r7rs.scm
+	cd ${TMPDIR} && COMPILE_R7RS=${SCHEME} timeout 120 compile-scheme -I . -o test-r7rs test-r7rs.scm
 	cd ${TMPDIR} && timeout 60 ./test-r7rs
 
 test-r7rs-docker: ${TMPDIR}