diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fb63c1e..ad8b4a61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 **Version 0.2.1**
  - Add rustdoc for public methods and structs
  - Improve filter mode 5 heuristic ([#16](https://github.com/shssoichiro/oxipng/issues/16))
+ - Add tests for edge-case images with subtitles ([#29](https://github.com/shssoichiro/oxipng/issues/29))
 
 **Version 0.2.0**
  - Fix program version that is displayed when running `oxipng -V`
diff --git a/tests/files/issue-29.png b/tests/files/issue-29.png
new file mode 100644
index 00000000..b52b0f41
Binary files /dev/null and b/tests/files/issue-29.png differ
diff --git a/tests/filters.rs b/tests/filters.rs
index f544ef45..eac3925a 100644
--- a/tests/filters.rs
+++ b/tests/filters.rs
@@ -1209,3 +1209,20 @@ fn filter_5_for_palette_1() {
                      png::ColorType::Indexed,
                      png::BitDepth::One);
 }
+
+#[test]
+fn issue_29() {
+    let input = PathBuf::from("tests/files/issue-29.png");
+    let mut opts = get_opts(&input);
+    opts.filter = HashSet::new();
+    opts.filter.insert(0);
+    let output = opts.out_file.clone();
+
+    test_it_converts(&input,
+                     &output,
+                     &opts,
+                     png::ColorType::RGB,
+                     png::BitDepth::Eight,
+                     png::ColorType::RGB,
+                     png::BitDepth::Eight);
+}