diff --git a/packager/live_packager_test.cc b/packager/live_packager_test.cc
index 4b0f765b851..bada3b13900 100644
--- a/packager/live_packager_test.cc
+++ b/packager/live_packager_test.cc
@@ -550,12 +550,14 @@ TEST_F(LivePackagerBaseTest, VerifyAes128WithDecryption) {
     live_config.format = LiveConfig::OutputFormat::TS;
     live_config.track_type = LiveConfig::TrackType::VIDEO;
     live_config.protection_scheme = LiveConfig::EncryptionScheme::AES_128;
+    live_config.segment_number = i;
 
     SetupLivePackagerConfig(live_config);
     ASSERT_EQ(Status::OK, live_packager_->Package(init_seg, media_seg, out));
     ASSERT_GT(out.SegmentSize(), 0);
 
-    std::string exp_segment_num = absl::StrFormat("expected/ts/%04d.ts", i + 1);
+    std::string exp_segment_num =
+        absl::StrFormat("expected/stuffing_ts/%04d.ts", i + 1);
     std::vector<uint8_t> exp_segment_buffer = ReadTestDataFile(exp_segment_num);
     ASSERT_FALSE(exp_segment_buffer.empty());
 
@@ -564,8 +566,7 @@ TEST_F(LivePackagerBaseTest, VerifyAes128WithDecryption) {
                                 out.SegmentData() + out.SegmentSize());
 
     ASSERT_TRUE(decryptor.Crypt(buffer, &decrypted));
-    // TODO(Fordyce): with null packet stuffing this is no longer valid
-    // ASSERT_EQ(decrypted, exp_segment_buffer);
+    ASSERT_EQ(decrypted, exp_segment_buffer);
   }
 }
 
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0001.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0001.ts
new file mode 100644
index 00000000000..e88fe40b543
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0001.ts differ
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0002.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0002.ts
new file mode 100644
index 00000000000..5be8aab693d
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0002.ts differ
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0003.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0003.ts
new file mode 100644
index 00000000000..6928af37e4e
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0003.ts differ
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0004.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0004.ts
new file mode 100644
index 00000000000..3f543c345e5
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0004.ts differ
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0005.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0005.ts
new file mode 100644
index 00000000000..872b50db6f2
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0005.ts differ
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0006.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0006.ts
new file mode 100644
index 00000000000..4aefd6036c4
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0006.ts differ
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0007.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0007.ts
new file mode 100644
index 00000000000..01a7be38fc3
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0007.ts differ
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0008.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0008.ts
new file mode 100644
index 00000000000..75989806d59
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0008.ts differ
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0009.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0009.ts
new file mode 100644
index 00000000000..15d341d355d
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0009.ts differ
diff --git a/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0010.ts b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0010.ts
new file mode 100644
index 00000000000..ed78d738687
Binary files /dev/null and b/packager/media/test/data/live_packager_tests/expected/stuffing_ts/0010.ts differ