diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py
index 44f2ca7c85..86602c54e3 100755
--- a/packager/app/test/packager_test.py
+++ b/packager/app/test/packager_test.py
@@ -181,9 +181,6 @@ class PackagerAppTest(unittest.TestCase):
         os.path.splitext(input_file_name)[0],
         descriptor)
 
-    if hls:
-      stream.Append('playlist_name', descriptor + '.m3u8')
-
     if trick_play_factor:
       stream.Append('trick_play_factor', trick_play_factor)
       output_file_name += '-trick_play_factor_%d' % trick_play_factor
@@ -197,6 +194,16 @@ class PackagerAppTest(unittest.TestCase):
 
     base_ext = GetExtension(descriptor, output_format)
 
+    if hls:
+      stream.Append('playlist_name', output_file_name + '.m3u8')
+
+      # By default, add a iframe playlist for all HLS playlists (assuming that
+      # the source input is supported). iframe playlists should only be for
+      # videos. This check will fail for numeric descriptors, but that is an
+      # acceptable limitation (b/73960731).
+      if base_ext in ['ts', 'mp4'] and descriptor == 'video':
+        stream.Append('iframe_playlist_name', output_file_name + '-iframe.m3u8')
+
     requires_init_segment = segmented and base_ext not in ['ts', 'vtt']
 
     output_file_path = os.path.join(self.tmp_dir, output_file_name)
diff --git a/packager/app/test/testdata/avc-aac-ts/audio.m3u8 b/packager/app/test/testdata/avc-aac-ts/bear-640x360-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-aac-ts/audio.m3u8
rename to packager/app/test/testdata/avc-aac-ts/bear-640x360-audio.m3u8
diff --git a/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-iframe.m3u8
new file mode 100644
index 0000000000..117d12f785
--- /dev/null
+++ b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video-iframe.m3u8
@@ -0,0 +1,16 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15604@376
+bear-640x360-video-1.ts
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18236@376
+bear-640x360-video-2.ts
+#EXTINF:0.667,
+#EXT-X-BYTERANGE:19928@376
+bear-640x360-video-3.ts
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-aac-ts/video.m3u8 b/packager/app/test/testdata/avc-aac-ts/bear-640x360-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-aac-ts/video.m3u8
rename to packager/app/test/testdata/avc-aac-ts/bear-640x360-video.m3u8
diff --git a/packager/app/test/testdata/avc-aac-ts/output.m3u8 b/packager/app/test/testdata/avc-aac-ts/output.m3u8
index dbd74f0f68..02b545801a 100644
--- a/packager/app/test/testdata/avc-aac-ts/output.m3u8
+++ b/packager/app/test/testdata/avc-aac-ts/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1217518,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=238897,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ac3-ts-to-mp4/audio.m3u8
rename to packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-audio.m3u8
diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8
new file mode 100644
index 0000000000..bc076ae417
--- /dev/null
+++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video-iframe.m3u8
@@ -0,0 +1,17 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXT-X-MAP:URI="bear-640x360-ac3-video.mp4",BYTERANGE="823@0"
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15581@891
+bear-640x360-ac3-video.mp4
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18221@100204
+bear-640x360-ac3-video.mp4
+#EXTINF:0.734,
+#EXT-X-BYTERANGE:19663@222011
+bear-640x360-ac3-video.mp4
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/video.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ac3-ts-to-mp4/video.m3u8
rename to packager/app/test/testdata/avc-ac3-ts-to-mp4/bear-640x360-ac3-video.m3u8
diff --git a/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8
index f788d95f5d..e21855727a 100644
--- a/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8
+++ b/packager/app/test/testdata/avc-ac3-ts-to-mp4/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1168277,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-ac3-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=214291,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ac3-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ac3-ts-with-encryption/audio.m3u8
rename to packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-audio.m3u8
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-iframe.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-iframe.m3u8
new file mode 100644
index 0000000000..2c3bb4b23c
--- /dev/null
+++ b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video-iframe.m3u8
@@ -0,0 +1,17 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity"
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15604@376
+bear-640x360-ac3-video-1.ts
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18236@376
+bear-640x360-ac3-video-2.ts
+#EXTINF:0.667,
+#EXT-X-BYTERANGE:19928@376
+bear-640x360-ac3-video-3.ts
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/video.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ac3-ts-with-encryption/video.m3u8
rename to packager/app/test/testdata/avc-ac3-ts-with-encryption/bear-640x360-ac3-video.m3u8
diff --git a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8
index 5b874572c1..c1463c5981 100644
--- a/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8
+++ b/packager/app/test/testdata/avc-ac3-ts-with-encryption/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1242703,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-ac3-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=238897,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ac3-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ac3-ts/audio.m3u8 b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ac3-ts/audio.m3u8
rename to packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-audio.m3u8
diff --git a/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-iframe.m3u8 b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-iframe.m3u8
new file mode 100644
index 0000000000..28a496a31e
--- /dev/null
+++ b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video-iframe.m3u8
@@ -0,0 +1,16 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15604@376
+bear-640x360-ac3-video-1.ts
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18236@376
+bear-640x360-ac3-video-2.ts
+#EXTINF:0.667,
+#EXT-X-BYTERANGE:19928@376
+bear-640x360-ac3-video-3.ts
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ac3-ts/video.m3u8 b/packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ac3-ts/video.m3u8
rename to packager/app/test/testdata/avc-ac3-ts/bear-640x360-ac3-video.m3u8
diff --git a/packager/app/test/testdata/avc-ac3-ts/output.m3u8 b/packager/app/test/testdata/avc-ac3-ts/output.m3u8
index 5b874572c1..c1463c5981 100644
--- a/packager/app/test/testdata/avc-ac3-ts/output.m3u8
+++ b/packager/app/test/testdata/avc-ac3-ts/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ac3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1242703,CODECS="avc1.64001e,ac-3",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-ac3-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=238897,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ac3-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/audio.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-event-playlist/audio.m3u8
rename to packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-audio.m3u8
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-iframe.m3u8
new file mode 100644
index 0000000000..2a25108bfb
--- /dev/null
+++ b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video-iframe.m3u8
@@ -0,0 +1,12 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:EVENT
+#EXT-X-I-FRAMES-ONLY
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15604@376
+bear-640x360-video-1.ts
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18236@376
+bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/video.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-event-playlist/video.m3u8
rename to packager/app/test/testdata/avc-ts-event-playlist/bear-640x360-video.m3u8
diff --git a/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8 b/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8
index dbd74f0f68..9911c7613d 100644
--- a/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-event-playlist/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1217518,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=145742,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/audio.m3u8
rename to packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-audio.m3u8
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-iframe.m3u8
new file mode 100644
index 0000000000..f74afa0620
--- /dev/null
+++ b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video-iframe.m3u8
@@ -0,0 +1,13 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-I-FRAMES-ONLY
+#EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MjM0NTY3ODkwMTIzNDU2MQ==",IV=0x3334353637383930,KEYFORMAT="identity"
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15604@376
+bear-640x360-video-1.ts
+#EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MzQ1Njc4OTAxMjM0NTYxMg==",IV=0x3334353637383930,KEYFORMAT="identity"
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18236@376
+bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/video.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/video.m3u8
rename to packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/bear-640x360-video.m3u8
diff --git a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8
index dbd74f0f68..9911c7613d 100644
--- a/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-live-playlist-with-key-rotation/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1217518,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=145742,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/audio.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-live-playlist/audio.m3u8
rename to packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-audio.m3u8
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-iframe.m3u8
new file mode 100644
index 0000000000..fe2f000d24
--- /dev/null
+++ b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video-iframe.m3u8
@@ -0,0 +1,11 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-I-FRAMES-ONLY
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15604@376
+bear-640x360-video-1.ts
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18236@376
+bear-640x360-video-2.ts
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/video.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-live-playlist/video.m3u8
rename to packager/app/test/testdata/avc-ts-live-playlist/bear-640x360-video.m3u8
diff --git a/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8 b/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8
index dbd74f0f68..9911c7613d 100644
--- a/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-live-playlist/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1217518,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=145742,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/audio.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/audio.m3u8
rename to packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-audio.m3u8
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-iframe.m3u8
new file mode 100644
index 0000000000..44bb1b9832
--- /dev/null
+++ b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video-iframe.m3u8
@@ -0,0 +1,17 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXT-X-KEY:METHOD=SAMPLE-AES,URI="skd://www.license.com/getkey?KeyId=31323334-3536-3738-3930-313233343536",KEYFORMATVERSIONS="1",KEYFORMAT="com.apple.streamingkeydelivery"
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15604@376
+bear-640x360-video-1.ts
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18236@376
+bear-640x360-video-2.ts
+#EXTINF:0.667,
+#EXT-X-BYTERANGE:19928@376
+bear-640x360-video-3.ts
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/video.m3u8
rename to packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/bear-640x360-video.m3u8
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8
index dbd74f0f68..02b545801a 100644
--- a/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-with-encryption-and-fairplay/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1217518,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=238897,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8
index 1ddf769ad5..52436bd98e 100644
--- a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/output.m3u8
@@ -2,4 +2,6 @@
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
 #EXT-X-STREAM-INF:BANDWIDTH=1183948,CODECS="avc1.64001f",RESOLUTION=1024x436
-video.m3u8
+sintel-1024x436-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=745984,CODECS="avc1.64001f",RESOLUTION=1024x436,URI="sintel-1024x436-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8
new file mode 100644
index 0000000000..d4e92ec12f
--- /dev/null
+++ b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video-iframe.m3u8
@@ -0,0 +1,29 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity"
+#EXTINF:1.000,
+#EXT-X-BYTERANGE:940@376
+sintel-1024x436-video-1.ts
+#EXTINF:1.000,
+#EXT-X-BYTERANGE:376@376
+sintel-1024x436-video-2.ts
+#EXTINF:0.917,
+#EXT-X-BYTERANGE:376@376
+sintel-1024x436-video-3.ts
+#EXTINF:0.958,
+#EXT-X-BYTERANGE:376@4700
+sintel-1024x436-video-3.ts
+#EXTINF:0.917,
+#EXT-X-BYTERANGE:5452@376
+sintel-1024x436-video-4.ts
+#EXTINF:1.000,
+#EXT-X-BYTERANGE:11092@376
+sintel-1024x436-video-5.ts
+#EXTINF:0.125,
+#EXT-X-BYTERANGE:11656@376
+sintel-1024x436-video-6.ts
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/video.m3u8
rename to packager/app/test/testdata/avc-ts-with-encryption-exercise-emulation-prevention/sintel-1024x436-video.m3u8
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/audio.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-with-encryption/audio.m3u8
rename to packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-audio.m3u8
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-iframe.m3u8
new file mode 100644
index 0000000000..ad51e2c4b3
--- /dev/null
+++ b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video-iframe.m3u8
@@ -0,0 +1,17 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXT-X-KEY:METHOD=SAMPLE-AES,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",IV=0x3334353637383930,KEYFORMAT="identity"
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15604@376
+bear-640x360-video-1.ts
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18236@376
+bear-640x360-video-2.ts
+#EXTINF:0.667,
+#EXT-X-BYTERANGE:19928@376
+bear-640x360-video-3.ts
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/video.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/avc-ts-with-encryption/video.m3u8
rename to packager/app/test/testdata/avc-ts-with-encryption/bear-640x360-video.m3u8
diff --git a/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8 b/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8
index dbd74f0f68..02b545801a 100644
--- a/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8
+++ b/packager/app/test/testdata/avc-ts-with-encryption/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1217518,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=238897,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/audio.m3u8
rename to packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-audio.m3u8
diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8
new file mode 100644
index 0000000000..95c9bb2c8a
--- /dev/null
+++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video-iframe.m3u8
@@ -0,0 +1,18 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXT-X-MAP:URI="bear-640x360-ec3-video.mp4",BYTERANGE="1091@0"
+#EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15665@1159
+bear-640x360-ec3-video.mp4
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18754@94964
+bear-640x360-ec3-video.mp4
+#EXTINF:0.734,
+#EXT-X-BYTERANGE:20068@217304
+bear-640x360-ec3-video.mp4
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/video.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/video.m3u8
rename to packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/bear-640x360-ec3-video.m3u8
diff --git a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8 b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8
index b7bec5bcf8..08be4f7b86 100644
--- a/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8
+++ b/packager/app/test/testdata/ec3-and-hls-single-segment-mp4-encrypted/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-ec3-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1174135,CODECS="avc1.64001e,ec-3",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-ec3-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218704,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-ec3-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/audio.m3u8
rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-audio.m3u8
diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8
new file mode 100644
index 0000000000..3b7cf9a41f
--- /dev/null
+++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video-iframe.m3u8
@@ -0,0 +1,19 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1091@0"
+#EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15581@1159
+bear-640x360-video.mp4
+#EXT-X-PLACEMENT-OPPORTUNITY
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18754@100472
+bear-640x360-video.mp4
+#EXTINF:0.734,
+#EXT-X-BYTERANGE:20068@222812
+bear-640x360-video.mp4
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/video.m3u8
rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/bear-640x360-video.m3u8
diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8
index b3f0c6f629..270c9d51a6 100644
--- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8
+++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted-and-ad-cues/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1111340,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218704,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"
diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/audio.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8
similarity index 100%
rename from packager/app/test/testdata/hls-single-segment-mp4-encrypted/audio.m3u8
rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-audio.m3u8
diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8
new file mode 100644
index 0000000000..a6adbcc3c9
--- /dev/null
+++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video-iframe.m3u8
@@ -0,0 +1,18 @@
+#EXTM3U
+#EXT-X-VERSION:6
+## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
+#EXT-X-TARGETDURATION:2
+#EXT-X-PLAYLIST-TYPE:VOD
+#EXT-X-I-FRAMES-ONLY
+#EXT-X-MAP:URI="bear-640x360-video.mp4",BYTERANGE="1091@0"
+#EXT-X-KEY:METHOD=SAMPLE-AES-CTR,URI="data:text/plain;base64,MTIzNDU2Nzg5MDEyMzQ1Ng==",KEYFORMAT="identity"
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:15581@1159
+bear-640x360-video.mp4
+#EXTINF:1.001,
+#EXT-X-BYTERANGE:18754@100472
+bear-640x360-video.mp4
+#EXTINF:0.734,
+#EXT-X-BYTERANGE:20068@222812
+bear-640x360-video.mp4
+#EXT-X-ENDLIST
diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/video.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8
similarity index 100%
rename from packager/app/test/testdata/hls-single-segment-mp4-encrypted/video.m3u8
rename to packager/app/test/testdata/hls-single-segment-mp4-encrypted/bear-640x360-video.m3u8
diff --git a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8 b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8
index b3f0c6f629..270c9d51a6 100644
--- a/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8
+++ b/packager/app/test/testdata/hls-single-segment-mp4-encrypted/output.m3u8
@@ -1,7 +1,9 @@
 #EXTM3U
 ## Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>
 
-#EXT-X-MEDIA:TYPE=AUDIO,URI="audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
+#EXT-X-MEDIA:TYPE=AUDIO,URI="bear-640x360-audio.m3u8",GROUP-ID="default-audio-group",NAME="stream_0",AUTOSELECT=YES,CHANNELS="2"
 
 #EXT-X-STREAM-INF:BANDWIDTH=1111340,CODECS="avc1.64001e,mp4a.40.2",RESOLUTION=640x360,AUDIO="default-audio-group"
-video.m3u8
+bear-640x360-video.m3u8
+
+#EXT-X-I-FRAME-STREAM-INF:BANDWIDTH=218704,CODECS="avc1.64001e",RESOLUTION=640x360,URI="bear-640x360-video-iframe.m3u8"