diff --git a/test/windows-1251-bulgarian.txt b/test/bg/windows-1251.txt
similarity index 100%
rename from test/windows-1251-bulgarian.txt
rename to test/bg/windows-1251.txt
diff --git a/test/iso-8859-1.txt b/test/fr/iso-8859-1.txt
similarity index 100%
rename from test/iso-8859-1.txt
rename to test/fr/iso-8859-1.txt
diff --git a/test/iso-8859-2.txt b/test/hu/iso-8859-2.txt
similarity index 100%
rename from test/iso-8859-2.txt
rename to test/hu/iso-8859-2.txt
diff --git a/test/shift_jis.txt b/test/ja/shift_jis.txt
similarity index 100%
rename from test/shift_jis.txt
rename to test/ja/shift_jis.txt
diff --git a/test/euc-kr.smi b/test/ko/euc-kr.smi
similarity index 100%
rename from test/euc-kr.smi
rename to test/ko/euc-kr.smi
diff --git a/test/iso-2022-kr.txt b/test/ko/iso-2022-kr.txt
similarity index 100%
rename from test/iso-2022-kr.txt
rename to test/ko/iso-2022-kr.txt
diff --git a/test/iso-8859-5.txt b/test/ru/iso-8859-5.txt
similarity index 100%
rename from test/iso-8859-5.txt
rename to test/ru/iso-8859-5.txt
diff --git a/test/windows-1251-russian.txt b/test/ru/windows-1251.txt
similarity index 100%
rename from test/windows-1251-russian.txt
rename to test/ru/windows-1251.txt
diff --git a/test/tis-620.txt b/test/th/tis-620.txt
similarity index 100%
rename from test/tis-620.txt
rename to test/th/tis-620.txt
diff --git a/test/big5.txt b/test/zh/big5.txt
similarity index 100%
rename from test/big5.txt
rename to test/zh/big5.txt
diff --git a/test/gb18030.txt b/test/zh/gb18030.txt
similarity index 100%
rename from test/gb18030.txt
rename to test/zh/gb18030.txt
diff --git a/test/utf8.txt b/test/zh/utf8.txt
similarity index 100%
rename from test/utf8.txt
rename to test/zh/utf8.txt