diff --git a/source/texk/web2c/ptexdir/pfname.test b/source/texk/web2c/ptexdir/pfname.test
index eeb6cf063..1c8ae8fff 100755
--- a/source/texk/web2c/ptexdir/pfname.test
+++ b/source/texk/web2c/ptexdir/pfname.test
@@ -4,7 +4,7 @@
 # You may freely use, modify and/or distribute this file.
 
 test -d ptests || mkdir -p ptests
-rm -f ptests/fn*.log ptests/fn*.txt
+rm -f ptests/fn*.log ptests/fn*.txt ptests/fn*.tex
 
 rc=0
 
@@ -18,8 +18,8 @@ for ienc in euc sjis; do
 for doc in fn fnさざ波; do
 
   echo '>>> Document:'$doc '  File Encoding:'$fenc '  Internal Encoding:'$ienc
-  ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc $doc.tex >ptests/$doc-$ienc-term.log || $rc=1
-  mv $doc-$ienc.txt $doc-$ienc.log ptests/
+  ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >ptests/$doc-$ienc-term.log || $rc=1
+  mv $doc-$ienc.txt $doc-$ienc.log $doc-tmp.tex ptests/
   diff ptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-utf8.txt || $rc=2
 
 done
@@ -39,8 +39,8 @@ for doc in fnさざ波-$fenc; do
   fi
 
   echo '>>> Document:'$doc '  File Encoding:'$fenc '  Internal Encoding:'$ienc
-  ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc $doc.tex >ptests/$doc-$fenc-term.log || $rc=3
-  mv $doc-$ienc.txt $doc-$ienc.log ptests/
+  ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >ptests/$doc-$fenc-term.log || $rc=3
+  mv $doc-$ienc.txt $doc-$ienc.log $doc-tmp.tex ptests/
   diff ptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-$fenc.txt || $rc=4
 
 done
@@ -48,24 +48,23 @@ done
 
 
 # pTeX, CP932 characters
+if [ "$COMSPEC" != "" ]; then
+echo "*** We guess OS is Windows."
+
 for fenc in sjis; do
 for doc in fn①㎝Ⅶ閒ｱ～-$fenc; do
 
   ienc=$fenc
-  if [ "$COMSPEC" != "" ]; then
-    echo "*** We guess OS is Windows."
-    if [ $fenc != euc ]; then ienc="sjis"; fi
-  else
-    echo "*** We guess OS is not Windows."
-    if [ $fenc != sjis ]; then ienc="euc"; fi
-  fi
+  if [ $fenc != euc ]; then ienc="sjis"; fi
 
   echo '>>> Document:'$doc '  File Encoding:'$fenc '  Internal Encoding:'$ienc
-  ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc $doc.tex >ptests/$doc-$fenc-term.log || $rc=3
-  mv $doc*.txt $doc-$ienc.log ptests/
+  ./ptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >ptests/$doc-$fenc-term.log || $rc=3
+  mv $doc*.txt $doc-$ienc.log $doc-tmp.tex ptests/
   diff ptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-$fenc.txt || $rc=4
 
 done
 done
 
+fi
+
 exit $rc
diff --git a/source/texk/web2c/ptexdir/tests/fn.tex b/source/texk/web2c/ptexdir/tests/fn.tex
index 13db96f5c..973650ab4 100644
--- a/source/texk/web2c/ptexdir/tests/fn.tex
+++ b/source/texk/web2c/ptexdir/tests/fn.tex
@@ -9,6 +9,11 @@
 \immediate\write0{abc αβγ абв あア※￥ 天地人}
 \immediate\closeout0
 
-\input fnさざ波.tex
+\immediate\openout1=fn-tmp.tex
+\immediate\write1{\relax}
+\immediate\closeout1
+
+\input "|cat fn-tmp.tex"
+\input fn-tmp.tex
 
 \relax\end
diff --git "a/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261\357\275\236-sjis.tex" "b/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261\357\275\236-sjis.tex"
index ee5e4b7b9..e923001c6 100644
--- "a/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261\357\275\236-sjis.tex"
+++ "b/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261\357\275\236-sjis.tex"
@@ -5,13 +5,15 @@
 
 \immediate\write16{JOB[\jobname] :: We are in fn�@�p�Z�豁`-sjis.tex}
 
-\immediate\openout1=fn�@�p�Z�豁`-sjis.txt
-\immediate\closeout1
-
-\input fn�@�p�Z�豁`-sjis.txt
-
 \immediate\openout0=\jobname.txt
 \immediate\write0{abc ������ �p�q�r ���A���� �V�n�l}
 \immediate\closeout0
 
+\immediate\openout1=fn�@�p�Z�豁`-sjis-tmp.tex
+\immediate\write1{\relax}
+\immediate\closeout1
+
+\input "|cat fn�@�p�Z�豁`-sjis-tmp.tex"
+\input fn�@�p�Z�豁`-sjis-tmp.tex
+
 \relax\end
diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex"
index 8f5f74be5..da49ed501 100644
--- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex"
+++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-euc.tex"
@@ -9,4 +9,11 @@
 \immediate\write0{abc ���¦� �ѧҧ� �������� ŷ�Ͽ�}
 \immediate\closeout0
 
+\immediate\openout1=fn������-euc-tmp.tex
+\immediate\write1{\relax}
+\immediate\closeout1
+
+\input "|cat fn������-euc-tmp.tex"
+\input fn������-euc-tmp.tex
+
 \relax\end
diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-jis.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-jis.tex"
index bbd878b9b..335fbb0fc 100644
--- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-jis.tex"
+++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-jis.tex"
@@ -9,4 +9,11 @@
 \immediate\write0{abc $B&A&B&C(B $B'Q'R'S(B $B$"%""(!o(B $BE7CO?M(B}
 \immediate\closeout0
 
+\immediate\openout1=fn$B$5$6GH(B-jis-tmp.tex
+\immediate\write1{\relax}
+\immediate\closeout1
+
+\input "|cat fn$B$5$6GH(B-jis-tmp.tex"
+\input fn$B$5$6GH(B-jis-tmp.tex
+
 \relax\end
diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex"
index 8948827f8..5235c756f 100644
--- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex"
+++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-sjis.tex"
@@ -9,4 +9,11 @@
 \immediate\write0{abc ������ �p�q�r ���A���� �V�n�l}
 \immediate\closeout0
 
+\immediate\openout1=fn�����g-sjis-tmp.tex
+\immediate\write1{\relax}
+\immediate\closeout1
+
+\input "|cat fn�����g-sjis-tmp.tex"
+\input fn�����g-sjis-tmp.tex
+
 \relax\end
diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex"
index 170431135..c1916cdbd 100644
--- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex"
+++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242-utf8.tex"
@@ -9,4 +9,11 @@
 \immediate\write0{abc αβγ абв あア※￥ 天地人}
 \immediate\closeout0
 
+\immediate\openout1=fnさざ波-utf8-tmp.tex
+\immediate\write1{\relax}
+\immediate\closeout1
+
+\input "|cat fnさざ波-utf8-tmp.tex"
+\input fnさざ波-utf8-tmp.tex
+
 \relax\end
diff --git "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex" "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex"
index fb897811c..9850ed57f 100644
--- "a/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex"
+++ "b/source/texk/web2c/ptexdir/tests/fn\343\201\225\343\201\226\346\263\242.tex"
@@ -9,4 +9,11 @@
 \immediate\write0{abc αβγ абв あア※￥ 天地人}
 \immediate\closeout0
 
+\immediate\openout1=fnさざ波-tmp.tex
+\immediate\write1{\relax}
+\immediate\closeout1
+
+\input "|cat fnさざ波-tmp.tex"
+\input fnさざ波-tmp.tex
+
 \relax\end
diff --git a/source/texk/web2c/uptexdir/pfname.test b/source/texk/web2c/uptexdir/pfname.test
index 1f93f8604..4113436c1 100755
--- a/source/texk/web2c/uptexdir/pfname.test
+++ b/source/texk/web2c/uptexdir/pfname.test
@@ -4,7 +4,7 @@
 # You may freely use, modify and/or distribute this file.
 
 test -d uptests || mkdir -p uptests
-rm -f uptests/fn*.log uptests/fn*.txt
+rm -f uptests/fn*.log uptests/fn*.txt uptests/fn*.tex
 
 rc=0
 
@@ -29,8 +29,8 @@ for doc in fn fnさざ波; do
   fi
 
   echo '>>> Document:'$doc '  File Encoding:'$fenc '  Internal Encoding:'$ienc
-  ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc $doc.tex >uptests/$doc-$ienc-term.log || $rc=1
-  mv $doc-$ienc.txt $doc-$ienc.log uptests/
+  ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >uptests/$doc-$ienc-term.log || $rc=1
+  mv $doc-$ienc.txt $doc-$ienc.log $doc-tmp.tex uptests/
   diff uptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-utf8.txt || $rc=2
 
 done
@@ -57,8 +57,8 @@ for doc in fnさざ波-$fenc; do
   fi
 
   echo '>>> Document:'$doc '  File Encoding:'$fenc '  Internal Encoding:'$ienc
-  ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc $doc.tex >uptests/$doc-$fenc-term.log || $rc=3
-  mv $doc-$ienc.txt $doc-$ienc.log uptests/
+  ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >uptests/$doc-$fenc-term.log || $rc=3
+  mv $doc-$ienc.txt $doc-$ienc.log $doc-tmp.tex uptests/
   diff uptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-$fenc.txt || $rc=4
 
 done
@@ -66,31 +66,25 @@ done
 
 
 # pTeX compatible mode, CP932 characters
+if [ "$COMSPEC" != "" ]; then
+echo "*** We guess OS is Windows."
+
 for fenc in sjis; do
 for doc in fn①㎝Ⅶ閒ｱ～-$fenc; do
 
   ienc=$fenc
-  if [ "$COMSPEC" != "" ]; then
-    echo "*** We guess OS is Windows."
-    if [ $fenc != euc ]; then ienc="sjis"; fi
-    if [ $ienc = uptex ]; then
-      command_line_encoding=utf8
-      export command_line_encoding
-    else
-      command_line_encoding=none
-      export command_line_encoding
-    fi
-  else
-    echo "*** We guess OS is not Windows."
-    if [ $fenc != sjis ]; then ienc="euc"; fi
-  fi
+  if [ $fenc != euc ]; then ienc="sjis"; fi
+  command_line_encoding=none
+  export command_line_encoding
 
   echo '>>> Document:'$doc '  File Encoding:'$fenc '  Internal Encoding:'$ienc
-  ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc $doc.tex >uptests/$doc-$fenc-term.log || $rc=3
-  mv $doc*.txt $doc-$ienc.log uptests/
+  ./uptex -ini -interaction nonstopmode -jobname=$doc-$ienc -kanji=$fenc --kanji-internal=$ienc --shell-escape $doc.tex >uptests/$doc-$fenc-term.log || $rc=3
+  mv $doc*.txt $doc-$ienc.log $doc-tmp.tex uptests/
   diff uptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-$fenc.txt || $rc=4
 
 done
 done
 
+fi
+
 exit $rc