diff --git a/source/texk/web2c/ptexdir/pfname.test b/source/texk/web2c/ptexdir/pfname.test
index 56826ac1f..eeb6cf063 100755
--- a/source/texk/web2c/ptexdir/pfname.test
+++ b/source/texk/web2c/ptexdir/pfname.test
@@ -49,7 +49,7 @@ done
 
 # pTeX, CP932 characters
 for fenc in sjis; do
-for doc in fn①㎝Ⅶ閒ｱ-$fenc; do
+for doc in fn①㎝Ⅶ閒ｱ～-$fenc; do
 
   ienc=$fenc
   if [ "$COMSPEC" != "" ]; then
@@ -62,7 +62,7 @@ for doc in fn①㎝Ⅶ閒ｱ-$fenc; 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-$fenc-term.log || $rc=3
-  mv $doc-$ienc.txt $doc-$ienc.log ptests/
+  mv $doc*.txt $doc-$ienc.log ptests/
   diff ptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-$fenc.txt || $rc=4
 
 done
diff --git "a/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261-sjis.tex" "b/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261-sjis.tex"
deleted file mode 100644
index 82e5f20b9..000000000
--- "a/source/texk/web2c/ptexdir/tests/fn\342\221\240\343\216\235\342\205\246\351\226\222\357\275\261-sjis.tex"
+++ /dev/null
@@ -1,17 +0,0 @@
-% fn�@�p�Z��-sjis.tex
-% Shift_JIS encoding
-\catcode`\{=1
-\catcode`\}=2
-
-\immediate\write16{JOB[\jobname] :: We are in fn�@�p�Z��-sjis.tex}
-
-\immediate\openout0=fn�@�p�Z��-sjis.txt
-\immediate\closeout0
-
-\input fn�@�p�Z��-sjis.txt
-
-\immediate\openout0=\jobname.txt
-\immediate\write0{abc ������ �p�q�r ���A���� �V�n�l}
-\immediate\closeout0
-
-\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"
new file mode 100644
index 000000000..ee5e4b7b9
--- /dev/null
+++ "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"
@@ -0,0 +1,17 @@
+% fn�@�p�Z�豁`-sjis.tex
+% Shift_JIS encoding, including CP932 platform-dependent characters
+\catcode`\{=1
+\catcode`\}=2
+
+\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
+
+\relax\end
diff --git a/source/texk/web2c/uptexdir/pfname.test b/source/texk/web2c/uptexdir/pfname.test
index ae1b59822..1f93f8604 100755
--- a/source/texk/web2c/uptexdir/pfname.test
+++ b/source/texk/web2c/uptexdir/pfname.test
@@ -67,7 +67,7 @@ done
 
 # pTeX compatible mode, CP932 characters
 for fenc in sjis; do
-for doc in fn①㎝Ⅶ閒ｱ-$fenc; do
+for doc in fn①㎝Ⅶ閒ｱ～-$fenc; do
 
   ienc=$fenc
   if [ "$COMSPEC" != "" ]; then
@@ -87,7 +87,7 @@ for doc in fn①㎝Ⅶ閒ｱ-$fenc; do
 
   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/
+  mv $doc*.txt $doc-$ienc.log uptests/
   diff uptests/$doc-$ienc.txt $srcdir/ptexdir/tests/fn-$fenc.txt || $rc=4
 
 done