diff --git a/Makefile b/Makefile
index c18fd434..443a9b2d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,8 @@ CONTRIB_LIBS =
 CONTRIB_INITS =
 CONTRIB_TESTS =
 CONTRIB_DOCS = $(wildcard contrib/*/docs/*.rst)
+PICRIN_ISSUE_TESTS = $(wildcard t/issue/*.scm)
+REPL_ISSUE_TESTS = $(wildcard t/issue/*.sh)
 
 TEST_RUNNER = bin/picrin
 
@@ -62,7 +64,7 @@ docs/contrib.rst: $(CONTRIB_DOCS)
 run: bin/picrin
 	bin/picrin
 
-test: test-contribs test-nostdlib
+test: test-contribs test-nostdlib test-issue
 
 test-contribs: bin/picrin $(CONTRIB_TESTS)
 
@@ -70,6 +72,16 @@ test-nostdlib:
 	$(CC) -I extlib/benz/include -D'PIC_ENABLE_LIBC=0' -D'PIC_ENABLE_FLOAT=0' -D'PIC_ENABLE_STDIO=0' -ffreestanding -nostdlib -fPIC -shared -std=c89 -pedantic -Wall -Wextra -Werror -o lib/libbenz.so $(BENZ_SRCS) etc/libc_polyfill.c -fno-stack-protector
 	rm -f lib/libbenz.so
 
+test-issue: test-picrin-issue test-repl-issue
+
+test-picrin-issue: $(TEST_RUNNER) $(PICRIN_ISSUE_TESTS)
+	$(TEST_RUNNER) $(PICRIN_ISSUE_TESTS)
+
+test-repl-issue: $(REPL_ISSUE_TESTS)
+
+$(REPL_ISSUE_TESTS):
+	PICRIN=$(TEST_RUNNER) ./$@
+
 install: all
 	install -c bin/picrin $(prefix)/bin/picrin
 
@@ -80,4 +92,4 @@ clean:
 	rm -f $(PICRIN_OBJS)
 	rm -f $(CONTRIB_OBJS)
 
-.PHONY: all install clean run test test-r7rs test-contribs doc $(CONTRIB_TESTS)
+.PHONY: all install clean run test test-r7rs test-contribs test-issue test-picrin-issue test-repl-issue doc $(CONTRIB_TESTS) $(REPL_ISSUE_TESTS)