diff --git a/tests/test-gendoc.t b/tests/check-gendoc
old mode 100644
new mode 100755
copy from tests/test-gendoc.t
copy to tests/check-gendoc
--- a/tests/test-gendoc.t
+++ b/tests/check-gendoc
@@ -1,66 +1,11 @@
-#require docutils
-#require gettext
-
-Test document extraction
+#!/bin/sh
+HGENCODING=UTF-8
+export HGENCODING
 
-  $ HGENCODING=UTF-8
-  $ export HGENCODING
-  $ { echo C; ls "$TESTDIR/../i18n"/*.po | sort; } | while read PO; do
-  >     LOCALE=`basename "$PO" .po`
-  >     echo
-  >     echo "% extracting documentation from $LOCALE"
-  >     echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt
-  >     echo "" >> gendoc-$LOCALE.txt
-  >     LANGUAGE=$LOCALE python "$TESTDIR/../doc/gendoc.py" >> gendoc-$LOCALE.txt 2> /dev/null || exit
-  > 
-  >     if [ $LOCALE != C ]; then
-  >         cmp -s gendoc-C.txt gendoc-$LOCALE.txt && echo '** NOTHING TRANSLATED **'
-  >     fi
-  > 
-  >     echo "checking for parse errors"
-  >     python "$TESTDIR/../doc/docchecker" gendoc-$LOCALE.txt
-  >     # We call runrst without adding "--halt warning" to make it report
-  >     # all errors instead of stopping on the first one.
-  >     python "$TESTDIR/../doc/runrst" html gendoc-$LOCALE.txt /dev/null
-  > done
-  
-  % extracting documentation from C
-  checking for parse errors
-  
-  % extracting documentation from da
-  checking for parse errors
-  
-  % extracting documentation from de
-  checking for parse errors
-  Die Dateien werden dem Projektarchiv beim n\xc3\xa4chsten \xc3\x9cbernehmen (commit) hinzugef\xc3\xbcgt. Um dies vorher r\xc3\xbcckg\xc3\xa4ngig zu machen, siehe:hg:`forget`. (esc)
-  warning: please have a space before :hg:
-  
-  % extracting documentation from el
-  checking for parse errors
-  
-  % extracting documentation from fr
-  checking for parse errors
-  
-  % extracting documentation from it
-  checking for parse errors
-  
-  % extracting documentation from ja
-  checking for parse errors
-  
-  % extracting documentation from pt_BR
-  checking for parse errors
-  
-  % extracting documentation from ro
-  checking for parse errors
-  
-  % extracting documentation from ru
-  checking for parse errors
-  
-  % extracting documentation from sv
-  checking for parse errors
-  
-  % extracting documentation from zh_CN
-  checking for parse errors
-  
-  % extracting documentation from zh_TW
-  checking for parse errors
+echo ".. -*- coding: utf-8 -*-" > gendoc.txt
+echo "" >> gendoc.txt
+LANGUAGE=$1 python "$TESTDIR/../doc/gendoc.py" >> gendoc.txt 2> /dev/null || exit
+
+echo "checking for parse errors"
+python "$TESTDIR/../doc/docchecker" gendoc.txt
+python "$TESTDIR/../doc/runrst" html gendoc.txt /dev/null
diff --git a/tests/test-gendoc-da.t b/tests/test-gendoc-da.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-da.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc da
+  checking for parse errors
diff --git a/tests/test-gendoc-de.t b/tests/test-gendoc-de.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-de.t
@@ -0,0 +1,6 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc de
+  checking for parse errors
+  Die Dateien werden dem Projektarchiv beim n\xc3\xa4chsten \xc3\x9cbernehmen (commit) hinzugef\xc3\xbcgt. Um dies vorher r\xc3\xbcckg\xc3\xa4ngig zu machen, siehe:hg:`forget`. (esc)
+  warning: please have a space before :hg:
diff --git a/tests/test-gendoc-el.t b/tests/test-gendoc-el.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-el.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc el
+  checking for parse errors
diff --git a/tests/test-gendoc-fr.t b/tests/test-gendoc-fr.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-fr.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc fr
+  checking for parse errors
diff --git a/tests/test-gendoc-it.t b/tests/test-gendoc-it.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-it.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc it
+  checking for parse errors
diff --git a/tests/test-gendoc-ja.t b/tests/test-gendoc-ja.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-ja.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc ja
+  checking for parse errors
diff --git a/tests/test-gendoc-pt_BR.t b/tests/test-gendoc-pt_BR.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-pt_BR.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc pt_BR
+  checking for parse errors
diff --git a/tests/test-gendoc-ro.t b/tests/test-gendoc-ro.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-ro.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc ro
+  checking for parse errors
diff --git a/tests/test-gendoc-ru.t b/tests/test-gendoc-ru.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-ru.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc ru
+  checking for parse errors
diff --git a/tests/test-gendoc-sv.t b/tests/test-gendoc-sv.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-sv.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc sv
+  checking for parse errors
diff --git a/tests/test-gendoc-zh_CN.t b/tests/test-gendoc-zh_CN.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-zh_CN.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc zh_CN
+  checking for parse errors
diff --git a/tests/test-gendoc-zh_TW.t b/tests/test-gendoc-zh_TW.t
new file mode 100644
--- /dev/null
+++ b/tests/test-gendoc-zh_TW.t
@@ -0,0 +1,4 @@
+#require docutils gettext
+
+  $ $TESTDIR/check-gendoc zh_TW
+  checking for parse errors
diff --git a/tests/test-gendoc.t b/tests/test-gendoc.t
--- a/tests/test-gendoc.t
+++ b/tests/test-gendoc.t
@@ -7,60 +7,26 @@ Test document extraction
   $ export HGENCODING
   $ { echo C; ls "$TESTDIR/../i18n"/*.po | sort; } | while read PO; do
   >     LOCALE=`basename "$PO" .po`
-  >     echo
   >     echo "% extracting documentation from $LOCALE"
-  >     echo ".. -*- coding: utf-8 -*-" > gendoc-$LOCALE.txt
-  >     echo "" >> gendoc-$LOCALE.txt
   >     LANGUAGE=$LOCALE python "$TESTDIR/../doc/gendoc.py" >> gendoc-$LOCALE.txt 2> /dev/null || exit
   > 
   >     if [ $LOCALE != C ]; then
-  >         cmp -s gendoc-C.txt gendoc-$LOCALE.txt && echo '** NOTHING TRANSLATED **'
+  >         if [ ! -f $TESTDIR/test-gendoc-$LOCALE.t ]; then
+  >             echo missing test-gendoc-$LOCALE.t
+  >         fi
+  >         cmp -s gendoc-C.txt gendoc-$LOCALE.txt && echo "** NOTHING TRANSLATED ($LOCALE) **"
   >     fi
-  > 
-  >     echo "checking for parse errors"
-  >     python "$TESTDIR/../doc/docchecker" gendoc-$LOCALE.txt
-  >     # We call runrst without adding "--halt warning" to make it report
-  >     # all errors instead of stopping on the first one.
-  >     python "$TESTDIR/../doc/runrst" html gendoc-$LOCALE.txt /dev/null
-  > done
-  
+  > done; true
   % extracting documentation from C
-  checking for parse errors
-  
   % extracting documentation from da
-  checking for parse errors
-  
   % extracting documentation from de
-  checking for parse errors
-  Die Dateien werden dem Projektarchiv beim n\xc3\xa4chsten \xc3\x9cbernehmen (commit) hinzugef\xc3\xbcgt. Um dies vorher r\xc3\xbcckg\xc3\xa4ngig zu machen, siehe:hg:`forget`. (esc)
-  warning: please have a space before :hg:
-  
   % extracting documentation from el
-  checking for parse errors
-  
   % extracting documentation from fr
-  checking for parse errors
-  
   % extracting documentation from it
-  checking for parse errors
-  
   % extracting documentation from ja
-  checking for parse errors
-  
   % extracting documentation from pt_BR
-  checking for parse errors
-  
   % extracting documentation from ro
-  checking for parse errors
-  
   % extracting documentation from ru
-  checking for parse errors
-  
   % extracting documentation from sv
-  checking for parse errors
-  
   % extracting documentation from zh_CN
-  checking for parse errors
-  
   % extracting documentation from zh_TW
-  checking for parse errors