diff --git a/doc/ui/cmd_argument/argument_outline.md b/doc/ui/cmd_argument/argument_outline.md
index d6cc2c6ed7cc1b9209d56b4348497427efe40ac3..bafa5dfef2c63ad5ed87211f1a2c0ec6cbcbbe05 100644
--- a/doc/ui/cmd_argument/argument_outline.md
+++ b/doc/ui/cmd_argument/argument_outline.md
@@ -68,7 +68,7 @@ It looks like there are a lot of arguments. However, most of them are for develo
 </tr>
 
 <tr>
-<td class="left">test_period</td>
+<td class="left">test_period_while_training</td>
 <td class="left">√</td><td class="left">√</td><td class="left"></td><td class="left"></td>
 </tr>
 
@@ -143,8 +143,13 @@ It looks like there are a lot of arguments. However, most of them are for develo
 </tr>
 
 <tr>
-<td class="left" rowspan = "2">testing during training</td><td class="left">test_all_data_in_one_period</td>
-<td class="left">√</td><td class="left">√</td><td class="left"></td><td class="left"></td>
+<td class="left" rowspan = "2">testing during training</td><td class="left">test_batches_while_training</td>
+<td class="left">√</td><td class="left">√</td><td class="left">√<</td><td class="left"></td>
+</tr>
+
+<tr>
+<td class="left" rowspan = "2">testing during training</td><td class="left">test_batches_while_end</td>
+<td class="left">√</td><td class="left">√</td><td class="left">√<</td><td class="left"></td>
 </tr>
 
 <tr>
diff --git a/doc/ui/cmd_argument/detail_introduction.md b/doc/ui/cmd_argument/detail_introduction.md
index 07608e5edf740bd3e1242913f1d2d7589ad313aa..0628289dbd683222e6a50b87fe7224bcf9c40964 100644
--- a/doc/ui/cmd_argument/detail_introduction.md
+++ b/doc/ui/cmd_argument/detail_introduction.md
@@ -109,9 +109,9 @@
   - Load parameter from this pass to test.
   - type: int32 (default: -1).
 
-* `--test_period`
-  - Run testing every test_period train batches. If not set, run testing each pass.
-  - type: int32 (default: 1000).
+* `--test_period_while_training`
+  - Run test every so many train batches. If not 0, test log_period batches. If 0, test nothing.
+  - type: int32 (default: 0).
 
 * `--test_wait`
   - Whether to wait for parameter per pass if not exist. If set test_data_path in submitting environment of cluster, it will launch one process to perfom testing, so we need to set test_wait=1. Note that in the cluster submitting environment, this argument has been set True by default.
@@ -121,8 +121,12 @@
   - File that saves the model list when testing. It was set automatically when using cluster submitting environment after setting model_path.
   - type: string (default: "", null).
 
-* `--test_all_data_in_one_period`
-  - This argument is usually used in testing period during traning. If true, all data will be tested in one test period. Otherwise (batch_size * log_peroid) data will be tested.
+* `--test_batches_while_training`
+  - Test test_batches_while_training batches if test_batches_while_training != 0. If 0, test on all test data.
+  - type: bool (default: 1000).
+
+* `--test_batches_while_end`
+  - Test test_batches_while_end batches if test_batches_while_end != 0. If 0, test on all test data.
   - type: bool (default: 0).
 
 * `--predict_output_dir`
diff --git a/doc/ui/cmd_argument/use_case.md b/doc/ui/cmd_argument/use_case.md
index a6bfba29af4f73055338c3a671bcafaa1456c7cf..b243560106df1281c9a0094f4ae6a0156292b36c 100644
--- a/doc/ui/cmd_argument/use_case.md
+++ b/doc/ui/cmd_argument/use_case.md
@@ -10,9 +10,10 @@ paddle train \
   --config=network_config \
   --save_dir=output \
   --trainer_count=COUNT \                #(default:1)
-  --test_period=M \                      #(default:1000）
-  --test_all_data_in_one_period=true \   #(default:false) 
-  --num_passes=N \                       #(defalut:100）
+  --test_period_while_training=M \       #(default:0)
+  --test_batches_while_training=BATCHES \#(default:1000) 
+  --test_batches_while_end=BATCHES \     #(default:0) 
+  --num_passes=N \                       #(defalut:100)
   --log_period=K \                       #(default:100)
   --dot_period=1000 \                    #(default:1)
   #[--show_parameter_stats_period=100] \ #(default:0)
diff --git a/paddle/trainer/Trainer.cpp b/paddle/trainer/Trainer.cpp
index 477813b4748f5f481e47aa697acd3d7ee081c2ea..107fa240cf37f24a4ae9147951d2d4469af83b20 100644
--- a/paddle/trainer/Trainer.cpp
+++ b/paddle/trainer/Trainer.cpp
@@ -49,7 +49,8 @@ P_DEFINE_int32(test_period_while_training, 0,
                " If not 0, test log_period batches."
                " If 0, test nothing.");
 P_DEFINE_int32(test_batches_while_training, 1000,
-               "test test_batches_while_training batches if test_period != 0."
+               "test test_batches_while_training batches if "
+               "test_batches_while_training != 0."
                " If 0, test on all test data");
 P_DEFINE_int32(test_batches_while_end, 0,
                "test test_batches_while_end batches at pass end."