diff --git a/test/code/test.go b/test/unit/test.go
similarity index 100%
rename from test/code/test.go
rename to test/unit/test.go
diff --git a/test/code/test.yaml b/test/unit/test.yaml
similarity index 100%
rename from test/code/test.yaml
rename to test/unit/test.yaml
diff --git a/test/script/_debug.php b/test/ztf/_debug.php
similarity index 100%
rename from test/script/_debug.php
rename to test/ztf/_debug.php
diff --git a/test/script/_utils.php b/test/ztf/_utils.php
similarity index 90%
rename from test/script/_utils.php
rename to test/ztf/_utils.php
index 40b40a6e063117b8c02ed0b0c661cdad0feaacfc..32f3725b5318d72f9f7ce40b2ecb56dfb305b43d 100644
--- a/test/script/_utils.php
+++ b/test/ztf/_utils.php
@@ -18,7 +18,7 @@ function getZDCmd()
     }
 
     if ($ret == '') {
-        die('Please test on 64/32 bits windows, or 64 bits linux, mac system.\n');
+        die('Please test on 64/32 bits windows, 64 bits linux or mac system.\n');
     } else {
         print("$ret \n");
     }
diff --git a/test/script/ddl_to_yaml.exp b/test/ztf/ddl_to_yaml.exp
similarity index 100%
rename from test/script/ddl_to_yaml.exp
rename to test/ztf/ddl_to_yaml.exp
diff --git a/test/script/ddl_to_yaml.php b/test/ztf/ddl_to_yaml.php
similarity index 100%
rename from test/script/ddl_to_yaml.php
rename to test/ztf/ddl_to_yaml.php
diff --git a/test/script/excel_src.exp b/test/ztf/excel_src.exp
similarity index 100%
rename from test/script/excel_src.exp
rename to test/ztf/excel_src.exp
diff --git a/test/script/excel_src.php b/test/ztf/excel_src.php
similarity index 100%
rename from test/script/excel_src.php
rename to test/ztf/excel_src.php
diff --git a/test/script/field_basic.exp b/test/ztf/field_basic.exp
similarity index 100%
rename from test/script/field_basic.exp
rename to test/ztf/field_basic.exp
diff --git a/test/script/field_basic.php b/test/ztf/field_basic.php
similarity index 100%
rename from test/script/field_basic.php
rename to test/ztf/field_basic.php
diff --git a/test/script/field_format.exp b/test/ztf/field_format.exp
similarity index 100%
rename from test/script/field_format.exp
rename to test/ztf/field_format.exp
diff --git a/test/script/field_format.php b/test/ztf/field_format.php
similarity index 100%
rename from test/script/field_format.php
rename to test/ztf/field_format.php
diff --git a/test/script/field_inherit.exp b/test/ztf/field_inherit.exp
similarity index 100%
rename from test/script/field_inherit.exp
rename to test/ztf/field_inherit.exp
diff --git a/test/script/field_inherit.php b/test/ztf/field_inherit.php
similarity index 100%
rename from test/script/field_inherit.php
rename to test/ztf/field_inherit.php
diff --git a/test/script/field_nested.exp b/test/ztf/field_nested.exp
similarity index 100%
rename from test/script/field_nested.exp
rename to test/ztf/field_nested.exp
diff --git a/test/script/field_nested.php b/test/ztf/field_nested.php
similarity index 100%
rename from test/script/field_nested.php
rename to test/ztf/field_nested.php
diff --git a/test/script/field_random.exp b/test/ztf/field_random.exp
similarity index 100%
rename from test/script/field_random.exp
rename to test/ztf/field_random.exp
diff --git a/test/script/field_random.php b/test/ztf/field_random.php
similarity index 100%
rename from test/script/field_random.php
rename to test/ztf/field_random.php
diff --git a/test/script/field_refer.exp b/test/ztf/field_refer.exp
similarity index 100%
rename from test/script/field_refer.exp
rename to test/ztf/field_refer.exp
diff --git a/test/script/field_refer.php b/test/ztf/field_refer.php
similarity index 100%
rename from test/script/field_refer.php
rename to test/ztf/field_refer.php
diff --git a/test/script/field_repeat.exp b/test/ztf/field_repeat.exp
similarity index 100%
rename from test/script/field_repeat.exp
rename to test/ztf/field_repeat.exp
diff --git a/test/script/field_repeat.php b/test/ztf/field_repeat.php
similarity index 100%
rename from test/script/field_repeat.php
rename to test/ztf/field_repeat.php
diff --git a/test/script/output_style.exp b/test/ztf/output_style.exp
similarity index 100%
rename from test/script/output_style.exp
rename to test/ztf/output_style.exp
diff --git a/test/script/output_style.php b/test/ztf/output_style.php
similarity index 100%
rename from test/script/output_style.php
rename to test/ztf/output_style.php