diff --git a/validate/data/Makefile.am b/validate/data/Makefile.am
index 6019523923..e3789e8195 100644
--- a/validate/data/Makefile.am
+++ b/validate/data/Makefile.am
@@ -13,6 +13,7 @@ scenarios_DATA = simple_seeks.scenario \
                  adaptive_video_framerate.scenario \
                  adaptive_video_framerate_size.scenario\
                  force_key_unit.scenario\
+                 seek_with_stop.scenario\
                  switch_audio_track.scenario
 
 EXTRA_DIST = simple_seeks.scenario \
@@ -29,4 +30,5 @@ EXTRA_DIST = simple_seeks.scenario \
              adaptive_video_framerate.scenario \
              adaptive_video_framerate_size.scenario\
              force_key_unit.scenario\
+             seek_with_stop.scenario\
              switch_audio_track.scenario
diff --git a/validate/data/scrub_forward_seeking.scenario b/validate/data/scrub_forward_seeking.scenario
index 88cc8b925a..947cf55ce3 100644
--- a/validate/data/scrub_forward_seeking.scenario
+++ b/validate/data/scrub_forward_seeking.scenario
@@ -1,3 +1,4 @@
 pause, playback_time=0.0
 seek, playback_time=0.0, start=position+0.1, repeat="min(10, (duration - 0.5))/0.1", flags=accurate+flush
 play, playback_time=0.0
+eos, name="EOS", playback_time=1.0
diff --git a/validate/data/seek_backward.scenario b/validate/data/seek_backward.scenario
index 572659821c..1b00a9b7fa 100644
--- a/validate/data/seek_backward.scenario
+++ b/validate/data/seek_backward.scenario
@@ -1,3 +1,4 @@
 seek, name=Backward-seek, playback_time="min(5.0, (duration/4))", rate=1.0, start=0.0, flags=accurate+flush
 seek, name=Backward-seek, playback_time="min(10.0, 2*(duration/4))", rate=1.0, start="min(5.0, duration/4)", flags=accurate+flush
-seek, name=Backward-seek, playback_time="min(15.0, 3*(duration/4))", rate=1.0, start="min(10.0, 2*(duration/4))", stop="min(15.0, 3*(duration/4))", flags=accurate+flush
+seek, name=Backward-seek, playback_time="min(15.0, 3*(duration/4))", rate=1.0, start="min(10.0, 2*(duration/4))", flags=accurate+flush
+eos, playback_time="min(15.0, 3*(duration/4))"
diff --git a/validate/data/seek_forward.scenario b/validate/data/seek_forward.scenario
index 46ea8585a6..80d12b9e8e 100644
--- a/validate/data/seek_forward.scenario
+++ b/validate/data/seek_forward.scenario
@@ -1,3 +1,4 @@
 seek, name=First-forward-seek, playback_time="min(5.0, (duration/8))", start="min(10, 2*(duration/8))", flags=accurate+flush
 seek, name=Second-forward-seek, playback_time="min(15.0, 3*(duration/8))", start="min(20, 4*(duration/8))", flags=accurate+flush
-seek, name=Third-forward-seek-with-stop-value-1-sec, playback_time="min(25, 5*(duration/8))", start="min(30.0, 6*(duration/8))", stop="min(35.0, -1)", flags=accurate+flush
+seek, name=Third-forward-seek, playback_time="min(25, 5*(duration/8))", start="min(30.0, 6*(duration/8))", flags=accurate+flush
+eos, name="EOS", playback_time=35.0
diff --git a/validate/data/seek_with_stop.scenario b/validate/data/seek_with_stop.scenario
new file mode 100644
index 0000000000..5ddaeadeb0
--- /dev/null
+++ b/validate/data/seek_with_stop.scenario
@@ -0,0 +1 @@
+seek, playback_time=1.0, start=0.0, stop="min(5.0, duration-1.0)", flags=accurate+flush