diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index f26e9c1a..66a67468 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs
@@ -1136,7 +1136,7 @@ mod test {
     macro_rules! test_decode {
         ($label:expr, $label_override:expr) => {
             let encoding = encoding_rs::Encoding::for_label($label_override.as_bytes()).unwrap();
-            let base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");
+            let base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/encoding");
             let path = base_path.join(format!("{}_in.txt", $label));
             let ref_path = base_path.join(format!("{}_in_ref.txt", $label));
             assert!(path.exists());
@@ -1155,7 +1155,7 @@ mod test {
     macro_rules! test_encode {
         ($label:expr, $label_override:expr) => {
             let encoding = encoding_rs::Encoding::for_label($label_override.as_bytes()).unwrap();
-            let base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests");
+            let base_path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/encoding");
             let path = base_path.join(format!("{}_out.txt", $label));
             let ref_path = base_path.join(format!("{}_out_ref.txt", $label));
             assert!(path.exists());
diff --git a/helix-view/tests/big5_in.txt b/helix-view/tests/encoding/big5_in.txt
similarity index 100%
rename from helix-view/tests/big5_in.txt
rename to helix-view/tests/encoding/big5_in.txt
diff --git a/helix-view/tests/big5_in_ref.txt b/helix-view/tests/encoding/big5_in_ref.txt
similarity index 100%
rename from helix-view/tests/big5_in_ref.txt
rename to helix-view/tests/encoding/big5_in_ref.txt
diff --git a/helix-view/tests/big5_out.txt b/helix-view/tests/encoding/big5_out.txt
similarity index 100%
rename from helix-view/tests/big5_out.txt
rename to helix-view/tests/encoding/big5_out.txt
diff --git a/helix-view/tests/big5_out_ref.txt b/helix-view/tests/encoding/big5_out_ref.txt
similarity index 100%
rename from helix-view/tests/big5_out_ref.txt
rename to helix-view/tests/encoding/big5_out_ref.txt
diff --git a/helix-view/tests/euc_kr_in.txt b/helix-view/tests/encoding/euc_kr_in.txt
similarity index 100%
rename from helix-view/tests/euc_kr_in.txt
rename to helix-view/tests/encoding/euc_kr_in.txt
diff --git a/helix-view/tests/euc_kr_in_ref.txt b/helix-view/tests/encoding/euc_kr_in_ref.txt
similarity index 100%
rename from helix-view/tests/euc_kr_in_ref.txt
rename to helix-view/tests/encoding/euc_kr_in_ref.txt
diff --git a/helix-view/tests/euc_kr_out.txt b/helix-view/tests/encoding/euc_kr_out.txt
similarity index 100%
rename from helix-view/tests/euc_kr_out.txt
rename to helix-view/tests/encoding/euc_kr_out.txt
diff --git a/helix-view/tests/euc_kr_out_ref.txt b/helix-view/tests/encoding/euc_kr_out_ref.txt
similarity index 100%
rename from helix-view/tests/euc_kr_out_ref.txt
rename to helix-view/tests/encoding/euc_kr_out_ref.txt
diff --git a/helix-view/tests/gb18030_in.txt b/helix-view/tests/encoding/gb18030_in.txt
similarity index 100%
rename from helix-view/tests/gb18030_in.txt
rename to helix-view/tests/encoding/gb18030_in.txt
diff --git a/helix-view/tests/gb18030_in_ref.txt b/helix-view/tests/encoding/gb18030_in_ref.txt
similarity index 100%
rename from helix-view/tests/gb18030_in_ref.txt
rename to helix-view/tests/encoding/gb18030_in_ref.txt
diff --git a/helix-view/tests/gb18030_out.txt b/helix-view/tests/encoding/gb18030_out.txt
similarity index 100%
rename from helix-view/tests/gb18030_out.txt
rename to helix-view/tests/encoding/gb18030_out.txt
diff --git a/helix-view/tests/gb18030_out_ref.txt b/helix-view/tests/encoding/gb18030_out_ref.txt
similarity index 100%
rename from helix-view/tests/gb18030_out_ref.txt
rename to helix-view/tests/encoding/gb18030_out_ref.txt
diff --git a/helix-view/tests/iso_2022_jp_in.txt b/helix-view/tests/encoding/iso_2022_jp_in.txt
similarity index 100%
rename from helix-view/tests/iso_2022_jp_in.txt
rename to helix-view/tests/encoding/iso_2022_jp_in.txt
diff --git a/helix-view/tests/iso_2022_jp_in_ref.txt b/helix-view/tests/encoding/iso_2022_jp_in_ref.txt
similarity index 100%
rename from helix-view/tests/iso_2022_jp_in_ref.txt
rename to helix-view/tests/encoding/iso_2022_jp_in_ref.txt
diff --git a/helix-view/tests/iso_2022_jp_out.txt b/helix-view/tests/encoding/iso_2022_jp_out.txt
similarity index 100%
rename from helix-view/tests/iso_2022_jp_out.txt
rename to helix-view/tests/encoding/iso_2022_jp_out.txt
diff --git a/helix-view/tests/iso_2022_jp_out_ref.txt b/helix-view/tests/encoding/iso_2022_jp_out_ref.txt
similarity index 100%
rename from helix-view/tests/iso_2022_jp_out_ref.txt
rename to helix-view/tests/encoding/iso_2022_jp_out_ref.txt
diff --git a/helix-view/tests/jis0208_in.txt b/helix-view/tests/encoding/jis0208_in.txt
similarity index 100%
rename from helix-view/tests/jis0208_in.txt
rename to helix-view/tests/encoding/jis0208_in.txt
diff --git a/helix-view/tests/jis0208_in_ref.txt b/helix-view/tests/encoding/jis0208_in_ref.txt
similarity index 100%
rename from helix-view/tests/jis0208_in_ref.txt
rename to helix-view/tests/encoding/jis0208_in_ref.txt
diff --git a/helix-view/tests/jis0208_out.txt b/helix-view/tests/encoding/jis0208_out.txt
similarity index 100%
rename from helix-view/tests/jis0208_out.txt
rename to helix-view/tests/encoding/jis0208_out.txt
diff --git a/helix-view/tests/jis0208_out_ref.txt b/helix-view/tests/encoding/jis0208_out_ref.txt
similarity index 100%
rename from helix-view/tests/jis0208_out_ref.txt
rename to helix-view/tests/encoding/jis0208_out_ref.txt
diff --git a/helix-view/tests/jis0212_in.txt b/helix-view/tests/encoding/jis0212_in.txt
similarity index 100%
rename from helix-view/tests/jis0212_in.txt
rename to helix-view/tests/encoding/jis0212_in.txt
diff --git a/helix-view/tests/jis0212_in_ref.txt b/helix-view/tests/encoding/jis0212_in_ref.txt
similarity index 100%
rename from helix-view/tests/jis0212_in_ref.txt
rename to helix-view/tests/encoding/jis0212_in_ref.txt
diff --git a/helix-view/tests/shift_jis_in.txt b/helix-view/tests/encoding/shift_jis_in.txt
similarity index 100%
rename from helix-view/tests/shift_jis_in.txt
rename to helix-view/tests/encoding/shift_jis_in.txt
diff --git a/helix-view/tests/shift_jis_in_ref.txt b/helix-view/tests/encoding/shift_jis_in_ref.txt
similarity index 100%
rename from helix-view/tests/shift_jis_in_ref.txt
rename to helix-view/tests/encoding/shift_jis_in_ref.txt
diff --git a/helix-view/tests/shift_jis_out.txt b/helix-view/tests/encoding/shift_jis_out.txt
similarity index 100%
rename from helix-view/tests/shift_jis_out.txt
rename to helix-view/tests/encoding/shift_jis_out.txt
diff --git a/helix-view/tests/shift_jis_out_ref.txt b/helix-view/tests/encoding/shift_jis_out_ref.txt
similarity index 100%
rename from helix-view/tests/shift_jis_out_ref.txt
rename to helix-view/tests/encoding/shift_jis_out_ref.txt