diff --git a/ChangeLog b/ChangeLog
index 583f9d0dee..7c55603909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  3 13:42:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (yes-test-sample): use RUNRUBY instead of MINIRUBY to set
+	  runtime library path and run the built ruby.  [Bug #8971]
+
 Thu Oct  3 00:17:15 2013  Akinori MUSHA  <knu@iDaemons.org>
 
 	* misc/ruby-additional.el: Properly quote the body.  An unquoted
diff --git a/common.mk b/common.mk
index 5cfbc3dc23..d42363401a 100644
--- a/common.mk
+++ b/common.mk
@@ -516,7 +516,7 @@ yes-btest-ruby: prog PHONY
 test-sample: $(TEST_RUNNABLE)-test-sample
 no-test-sample: PHONY
 yes-test-sample: prog PHONY
-	$(Q)$(MINIRUBY) $(srcdir)/tool/rubytest.rb --run-opt=$(RUN_OPTS) $(OPTS) $(TESTOPTS)
+	$(Q)$(RUNRUBY) $(srcdir)/tool/rubytest.rb --run-opt=$(RUN_OPTS) $(OPTS) $(TESTOPTS)
 
 test-knownbugs: test-knownbug
 test-knownbug: $(TEST_RUNNABLE)-test-knownbug