diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2662181
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.tgz
+venv
+*.html
diff --git a/Makefile b/Makefile
index 530b63f..8116fbc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 	test-r7rs-docker
 .PHONY: test-r6rs test-r7rs
 SCHEME=chibi
+RNRS=r7rs
 SRFI=170
 AUTHOR=Retropikzel
 
@@ -31,6 +32,29 @@ install:
 uninstall:
 	-snow-chibi remove --impls=${SCHEME} ${PKG}
 
+init-venv: build
+	@rm -rf venv
+	@scheme-venv ${SCHEME} ${RNRS} venv
+	@echo "(import (scheme base) (scheme write) (scheme read) (scheme char) (scheme file) (scheme process-context) (srfi 64) (srfi ${SRFI}))" > venv/test.scm
+	@printf "#!r6rs\n(import (rnrs) (srfi :64) (srfi :${SRFI}))" > venv/test.sps
+	@cat ${TESTFILE} >> venv/test.scm
+	@cat ${TESTFILE} >> venv/test.sps
+	@if [ "${RNRS}" = "r6rs" ]; then if [ -d ../foreign-c ]; then cp -r ../foreign-c/foreign venv/lib/; fi; fi
+	@if [ "${RNRS}" = "r6rs" ]; then cp -r retropikzel venv/lib/; fi
+	@if [ "${SCHEME}" = "chezs" ]; then ./venv/bin/akku install akku-r7rs chez-srfi; fi
+	@if [ "${SCHEME}" = "ikarus" ]; then ./venv/bin/akku install akku-r7rs chez-srfi; fi
+	@if [ "${SCHEME}" = "ironscheme" ]; then ./venv/bin/akku install akku-r7rs chez-srfi; fi
+	@if [ "${SCHEME}" = "racket" ]; then ./venv/bin/akku install akku-r7rs chez-srfi; fi
+	@if [ "${RNRS}" = "r6rs" ]; then ./venv/bin/akku install; fi
+	@if [ "${SCHEME}" = "chicken" ]; then ./venv/bin/snow-chibi install --always-yes srfi.64; fi
+	@if [ "${SCHEME}-${RNRS}" = "mosh-r7rs" ]; then ./venv/bin/snow-chibi install --always-yes srfi.64; fi
+	@if [ "${RNRS}" = "r7rs" ]; then ./venv/bin/snow-chibi install ${PKG}; fi
+
+run-test: init-venv
+	if [ "${RNRS}" = "r6rs" ]; then ./venv/bin/scheme-compile venv/test.sps; fi
+	if [ "${RNRS}" = "r7rs" ]; then VENV_CSC_ARGS="-L -lcurl" ./venv/bin/scheme-compile venv/test.scm; fi
+	./venv/test
+
 test-r7rs: tmpdir
 	@if [ "${SCHEME}" = "chibi" ]; then rm -rf ${TMPDIR}/srfi/98.*; fi
 	cd ${TMPDIR} && echo "(import (scheme base) (scheme write) (scheme file) (scheme process-context) (foreign c) (srfi ${SRFI}) (srfi 64))" > test-r7rs.scm