diff --git a/ChangeLog b/ChangeLog
index 29fe0dc394..e80afef5d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun  9 21:09:02 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* bootstraptest/test_knownbug.rb -> ./test_knownbug.rb: moved.
+
+	* common.mk: add a rule "test-knownbug".
+
 Mon Jun  9 21:00:32 2008  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* complex.c (nucomp_s_convert): can accept Complex('i').
diff --git a/common.mk b/common.mk
index 3f6986e40d..b4f3f816ac 100644
--- a/common.mk
+++ b/common.mk
@@ -360,7 +360,10 @@ btest-miniruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
 test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
 	@$(MINIRUBY) $(srcdir)/rubytest.rb
 
-test: test-sample btest-miniruby
+test-knownbug: miniruby$(EXEEXT) $(PROGRAM) PHONY
+	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(srcdir)/test_knownbug.rb
+
+test: test-sample btest-miniruby test-knownbug
 
 test-all:
 	$(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
diff --git a/bootstraptest/test_knownbug.rb b/test_knownbug.rb
similarity index 100%
rename from bootstraptest/test_knownbug.rb
rename to test_knownbug.rb