diff --git a/ChangeLog b/ChangeLog
index 5b3e2780dd..8d6145d5fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Aug 16 12:29:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, win32/Makefile.sub (test-rubyspec-precheck): split
+	  from test-rubyspec.
+
+	* common.mk (test-rubyspec): moved from Makefile.in.
+
 Mon Aug 16 10:00:45 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.h (llabs): never never never never never
diff --git a/Makefile.in b/Makefile.in
index 57af5cf6cc..08234a343d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -313,9 +313,8 @@ update-rubyspec: update-mspec
 	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
 	fi
 
-test-rubyspec:
+test-rubyspec-precheck:
 	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
-	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
 
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc
diff --git a/common.mk b/common.mk
index 66aaea9ae6..967a599c51 100644
--- a/common.mk
+++ b/common.mk
@@ -446,6 +446,11 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(PREP)
 		-install_name=$(RUBY_INSTALL_NAME) \
 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
+test-rubyspec-precheck:
+
+test-rubyspec: test-rubyspec-precheck
+	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+
 encs: enc trans
 encs enc trans: $(ENC_MK) $(LIBRUBY) $(PREP)
 	$(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 8562162c6e..fa91fc6f25 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -367,6 +367,12 @@ update-rubyspec: update-mspec
 	@cd $(srcdir:/=\) && git clone $(RUBYSPEC_GIT_URL) spec/rubyspec
 !endif
 
+test-rubyspec-precheck:
+!if !exist($(srcdir)/spec/rubyspec/.)
+	@echo No rubyspec here.  make update-rubyspec first.
+	@exit 1
+!endif
+
 $(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/enc/Makefile.in
 	$(COMSPEC) /C $(win_srcdir:/=\)\configure.bat $(configure_args)
 	@echo $(MKFILES) should be updated, re-run $(MAKE).