diff --git a/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java b/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java
index 9f846c26d..ee4d43131 100644
--- a/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java
+++ b/core/src/test/java/de/danoeh/antennapod/core/util/id3reader/ChapterReaderTest.java
@@ -131,4 +131,35 @@ public class ChapterReaderTest {
         assertEquals(EmbeddedChapterImage.makeUrl(2766765, 15740), chapters.get(1).getImageUrl());
         assertEquals(EmbeddedChapterImage.makeUrl(2782628, 2750569), chapters.get(2).getImageUrl());
     }
+
+    @Test
+    public void testRealFileAuphonic() throws IOException, ID3ReaderException {
+        CountingInputStream inputStream = new CountingInputStream(getClass().getClassLoader()
+                .getResource("media-parser/auphonic.mp3").openStream());
+        ChapterReader reader = new ChapterReader(inputStream);
+        reader.readInputStream();
+        List<Chapter> chapters = reader.getChapters();
+
+        assertEquals(4, chapters.size());
+
+        assertEquals(0, chapters.get(0).getStart());
+        assertEquals(3000, chapters.get(1).getStart());
+        assertEquals(6000, chapters.get(2).getStart());
+        assertEquals(9000, chapters.get(3).getStart());
+
+        assertEquals("Chapter 1 - ❤️😊", chapters.get(0).getTitle());
+        assertEquals("Chapter 2 - ßöÄ", chapters.get(1).getTitle());
+        assertEquals("Chapter 3 - 爱", chapters.get(2).getTitle());
+        assertEquals("Chapter 4", chapters.get(3).getTitle());
+
+        assertEquals("https://example.com", chapters.get(0).getLink());
+        assertEquals("https://example.com", chapters.get(1).getLink());
+        assertEquals("https://example.com", chapters.get(2).getLink());
+        assertEquals("https://example.com", chapters.get(3).getLink());
+
+        assertEquals(EmbeddedChapterImage.makeUrl(765, 308), chapters.get(0).getImageUrl());
+        assertEquals(EmbeddedChapterImage.makeUrl(1271, 308), chapters.get(1).getImageUrl());
+        assertEquals(EmbeddedChapterImage.makeUrl(1771, 308), chapters.get(2).getImageUrl());
+        assertEquals(EmbeddedChapterImage.makeUrl(2259, 308), chapters.get(3).getImageUrl());
+    }
 }
diff --git a/core/src/test/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentChapterReaderTest.java b/core/src/test/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentChapterReaderTest.java
new file mode 100644
index 000000000..cf9228292
--- /dev/null
+++ b/core/src/test/java/de/danoeh/antennapod/core/util/vorbiscommentreader/VorbisCommentChapterReaderTest.java
@@ -0,0 +1,44 @@
+package de.danoeh.antennapod.core.util.vorbiscommentreader;
+
+import de.danoeh.antennapod.core.feed.Chapter;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class VorbisCommentChapterReaderTest {
+
+    @Test
+    public void testRealFilesAuphonic() throws IOException, VorbisCommentReaderException {
+        testRealFileAuphonic("media-parser/auphonic.ogg");
+        testRealFileAuphonic("media-parser/auphonic.opus");
+    }
+
+    public void testRealFileAuphonic(String filename) throws IOException, VorbisCommentReaderException {
+        InputStream inputStream = getClass().getClassLoader()
+                .getResource(filename).openStream();
+        VorbisCommentChapterReader reader = new VorbisCommentChapterReader();
+        reader.readInputStream(inputStream);
+        List<Chapter> chapters = reader.getChapters();
+
+        assertEquals(4, chapters.size());
+
+        assertEquals(0, chapters.get(0).getStart());
+        assertEquals(3000, chapters.get(1).getStart());
+        assertEquals(6000, chapters.get(2).getStart());
+        assertEquals(9000, chapters.get(3).getStart());
+
+        assertEquals("Chapter 1 - ❤️😊", chapters.get(0).getTitle());
+        assertEquals("Chapter 2 - ßöÄ", chapters.get(1).getTitle());
+        assertEquals("Chapter 3 - 爱", chapters.get(2).getTitle());
+        assertEquals("Chapter 4", chapters.get(3).getTitle());
+
+        assertEquals("https://example.com", chapters.get(0).getLink());
+        assertEquals("https://example.com", chapters.get(1).getLink());
+        assertEquals("https://example.com", chapters.get(2).getLink());
+        assertEquals("https://example.com", chapters.get(3).getLink());
+    }
+}
diff --git a/core/src/test/resources/media-parser/auphonic.m4a b/core/src/test/resources/media-parser/auphonic.m4a
new file mode 100644
index 000000000..ca59a80f6
Binary files /dev/null and b/core/src/test/resources/media-parser/auphonic.m4a differ
diff --git a/core/src/test/resources/media-parser/auphonic.mp3 b/core/src/test/resources/media-parser/auphonic.mp3
new file mode 100644
index 000000000..ca2a7ed4f
Binary files /dev/null and b/core/src/test/resources/media-parser/auphonic.mp3 differ
diff --git a/core/src/test/resources/media-parser/auphonic.ogg b/core/src/test/resources/media-parser/auphonic.ogg
new file mode 100644
index 000000000..de326517a
Binary files /dev/null and b/core/src/test/resources/media-parser/auphonic.ogg differ
diff --git a/core/src/test/resources/media-parser/auphonic.opus b/core/src/test/resources/media-parser/auphonic.opus
new file mode 100644
index 000000000..08538ecb7
Binary files /dev/null and b/core/src/test/resources/media-parser/auphonic.opus differ