diff --git a/Makefile b/Makefile
index 030a248e..ccc08d82 100644
--- a/Makefile
+++ b/Makefile
@@ -68,10 +68,7 @@ docs/contrib.rst: $(CONTRIB_DOCS)
 run: bin/picrin
 	bin/picrin
 
-test: test-r7rs test-contribs test-nostdlib
-
-test-r7rs: bin/picrin t/r7rs-tests.scm
-	bin/picrin t/r7rs-tests.scm
+test: test-contribs test-nostdlib
 
 test-contribs: bin/picrin $(CONTRIB_TESTS)
 
diff --git a/contrib/20.r7rs/nitro.mk b/contrib/20.r7rs/nitro.mk
index eef49eac..9ddf756f 100644
--- a/contrib/20.r7rs/nitro.mk
+++ b/contrib/20.r7rs/nitro.mk
@@ -22,3 +22,10 @@ CONTRIB_LIBS += \
 	contrib/20.r7rs/scheme/process-context.scm\
 	contrib/20.r7rs/scheme/time.scm\
 	contrib/20.r7rs/scheme/r5rs.scm
+
+CONTRIB_TESTS += test-r7rs
+
+test-r7rs: bin/picrin
+	for test in `ls contrib/20.r7rs/t/*.scm`; do \
+	  bin/picrin "$$test"; \
+	done
diff --git a/t/r7rs-tests.scm b/contrib/20.r7rs/t/r7rs.scm
similarity index 100%
rename from t/r7rs-tests.scm
rename to contrib/20.r7rs/t/r7rs.scm