diff --git a/tests/results.txt b/tests/results.txt
index 2fd58f713..508c9375b 100644
--- a/tests/results.txt
+++ b/tests/results.txt
@@ -341,3 +341,4 @@ T_492truehd_ac3_setting_track_properties:076b157723cf84fa785130f4f87f15ab-cf8bae
 T_493truehd_ac3_setting_track_properties_mpeg_ts:8256eca144895021b5cf265efaf7bf29-73d08590bcb0d35a81c816a3c74eb116-59203f0671a1a2089f29034551644208-fa84f1b5c95de4ff100ec6d1888c0d7e-e4460272dfdf3e4cdb432d2656cc0a95-da8ae3b777d10ddfca98c131284ab841:passed:20150413-211707:16.127728072
 T_494dont_abort_with_aac_error_proection_specific_config:f18d6c1a0cd91fcb216fac7ee68bd5f1:passed:20150416-092327:0.59008572
 T_495default_durataion_and_sync:b360d52e56d8d291a7dc24ecd2b63c18-0a38dc656269f588fc4228d50e930d12-8f3d5eeacee5a77075eed0e7ae0d882a:passed:20150417-213623:0.894261521
+T_496segment_size_0:9fd6d5e57b47693a483f9aad112a6a15-a78f5ddc1a9fb900b3797ced8752cb92:passed:20150530-180226:0.051304978
diff --git a/tests/test-496segment_size_0.rb b/tests/test-496segment_size_0.rb
new file mode 100755
index 000000000..83507e814
--- /dev/null
+++ b/tests/test-496segment_size_0.rb
@@ -0,0 +1,7 @@
+#!/usr/bin/ruby -w
+
+file = "data/mkv/segment_size_0.mkv"
+
+describe "mkvinfo, mkvmerge / segment size 0"
+test_info file
+test_identify file