diff --git a/tests/pio_cksum_grb2.run.in b/tests/pio_cksum_grb2.run.in
index d6900778022d008e57893d9b4e0e7bdef6243549..cbd6d287a81f4c55b703da93ddbee9373e533bca 100644
--- a/tests/pio_cksum_grb2.run.in
+++ b/tests/pio_cksum_grb2.run.in
@@ -1,8 +1,8 @@
 #!@SHELL@
 
+suffix=grb2
 pio_write_args="-w 3"
 mpi_task_num=8
-suffix=grb2
 
 . ./pio_write.run
 ( . ./pio_write_dist_array.run ) || test $? -eq 77
diff --git a/tests/pio_write.parallel.run.in b/tests/pio_write.parallel.run.in
index f65edf9020b3c104ec8c1e5faa1ed65b02762146..1bf4561e3334a747273f556ee96c024a70c1f733 100644
--- a/tests/pio_write.parallel.run.in
+++ b/tests/pio_write.parallel.run.in
@@ -1,6 +1,6 @@
 #!@SHELL@
 
-mpi_task_num=${mpi_task_num-4}
+mpi_task_num=4
 
 . ./pio_write.run
 #
diff --git a/tests/pio_write_deco2d.parallel.run.in b/tests/pio_write_deco2d.parallel.run.in
index 313d80445473d6ad37d30cd28c32eda822406a00..e1f12dae0e4a26e1bdcef171d29ee98f1c47cc2b 100644
--- a/tests/pio_write_deco2d.parallel.run.in
+++ b/tests/pio_write_deco2d.parallel.run.in
@@ -1,8 +1,7 @@
 #!@SHELL@
 
-suffix=grb
 mpi_task_num=6
-pio_write=./pio_write_deco2d.parallel
+pio_write='./pio_write_deco2d.parallel'
 
 . ./pio_write.run
 #
diff --git a/tests/pio_write_deco2d.run.in b/tests/pio_write_deco2d.run.in
index 7ceaf906d368c91cdb9ca165c23bbf7489b0c9d2..d534643e2b7ad7fced5497ba385c8b7b5bbdad45 100644
--- a/tests/pio_write_deco2d.run.in
+++ b/tests/pio_write_deco2d.run.in
@@ -1,7 +1,6 @@
 #!@SHELL@
 
-suffix=grb
-pio_write=./pio_write_deco2d
+pio_write='./pio_write_deco2d'
 
 . ./pio_write.run
 #