diff --git a/ChangeLog b/ChangeLog
index 6d41296de7..e0131ad24b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 14 21:50:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (TESTS): skips minitest by default, since it interferes
+	  with test/unit.
+
 Tue Oct 14 21:36:29 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 
 	* ext/win32ole/win32ole.c (load_conv_function51932): check
diff --git a/common.mk b/common.mk
index 807767856a..84b7460ed9 100644
--- a/common.mk
+++ b/common.mk
@@ -110,6 +110,7 @@ INSTALL_DATA_MODE = 0644
 PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \
 			$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
 
+TESTS         = -x minitest
 TESTSDIR      = $(srcdir)/test
 TESTWORKDIR   = testwork