diff --git a/packager/app/test/packager_test.py b/packager/app/test/packager_test.py
index 13213254bb..eb6cbedad2 100755
--- a/packager/app/test/packager_test.py
+++ b/packager/app/test/packager_test.py
@@ -540,9 +540,7 @@ class PackagerFunctionalTest(PackagerAppTest):
   def testPackageAudioVideo(self):
     self.assertPackageSuccess(
         self._GetStreams(['audio', 'video']), self._GetFlags())
-    self._DiffGold(self.output[0], 'bear-640x360-a-golden.mp4')
-    self._DiffGold(self.output[1], 'bear-640x360-v-golden.mp4')
-    self._DiffGold(self.mpd_output, 'bear-640x360-av-golden.mpd')
+    self._CheckTestResults('audio-video')
 
   def testPackageAudioVideoWithTrickPlay(self):
     streams = [
diff --git a/packager/app/test/testdata/audio-video/output.mpd b/packager/app/test/testdata/audio-video/output.mpd
new file mode 100644
index 0000000000..dfa8debf37
--- /dev/null
+++ b/packager/app/test/testdata/audio-video/output.mpd
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated with https://github.com/google/shaka-packager version <tag>-<hash>-<test>-->
+<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="urn:mpeg:dash:schema:mpd:2011 DASH-MPD.xsd" xmlns:cenc="urn:mpeg:cenc:2013" profiles="urn:mpeg:dash:profile:isoff-on-demand:2011" minBufferTime="PT2S" type="static" mediaPresentationDuration="PT2.76317S">
+  <Period id="0">
+    <AdaptationSet id="0" contentType="video" width="640" height="360" frameRate="30000/1001" subsegmentAlignment="true" par="16:9">
+      <Representation id="0" bandwidth="882064" codecs="avc1.64001e" mimeType="video/mp4" sar="1:1">
+        <BaseURL>output_video.mp4</BaseURL>
+        <SegmentBase indexRange="823-890" timescale="30000">
+          <Initialization range="0-822"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+    <AdaptationSet id="1" contentType="audio" subsegmentAlignment="true">
+      <Representation id="1" bandwidth="126510" codecs="mp4a.40.2" mimeType="audio/mp4" audioSamplingRate="44100">
+        <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2"/>
+        <BaseURL>output_audio.mp4</BaseURL>
+        <SegmentBase indexRange="757-824" timescale="44100">
+          <Initialization range="0-756"/>
+        </SegmentBase>
+      </Representation>
+    </AdaptationSet>
+  </Period>
+</MPD>
diff --git a/packager/app/test/testdata/audio-video/output_audio.mp4 b/packager/app/test/testdata/audio-video/output_audio.mp4
new file mode 100644
index 0000000000..363c933a1a
Binary files /dev/null and b/packager/app/test/testdata/audio-video/output_audio.mp4 differ
diff --git a/packager/app/test/testdata/audio-video/output_video.mp4 b/packager/app/test/testdata/audio-video/output_video.mp4
new file mode 100644
index 0000000000..a4315c32cb
Binary files /dev/null and b/packager/app/test/testdata/audio-video/output_video.mp4 differ