diff --git a/validate/data/Makefile.am b/validate/data/Makefile.am
index 6b83d92ba6..9360957e20 100644
--- a/validate/data/Makefile.am
+++ b/validate/data/Makefile.am
@@ -18,6 +18,7 @@ scenarios_DATA = simple_seeks.scenario \
                  switch_subtitle_track.scenario\
                  switch_subtitle_track_while_paused.scenario\
                  disable_subtitle_track_while_paused.scenario\
+                 change_state_intensive.scenario\
                  switch_audio_track.scenario
 
 EXTRA_DIST = simple_seeks.scenario \
@@ -39,4 +40,5 @@ EXTRA_DIST = simple_seeks.scenario \
              switch_subtitle_track.scenario\
              switch_subtitle_track_while_paused.scenario\
              disable_subtitle_track_while_paused.scenario\
+			 change_state_intensive.scenario\
              switch_audio_track.scenario
diff --git a/validate/data/change_state_intensive.scenario b/validate/data/change_state_intensive.scenario
new file mode 100644
index 0000000000..d5e54c94f5
--- /dev/null
+++ b/validate/data/change_state_intensive.scenario
@@ -0,0 +1,40 @@
+description, duration=0, summary="Set state to NULL->PLAYING->NULL 20 times"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+set-state, state="null"
+set-state, state="playing"
+stop;
diff --git a/validate/tools/launcher/apps/gst-validate.py b/validate/tools/launcher/apps/gst-validate.py
index 0b6cdea5a8..eb30773959 100644
--- a/validate/tools/launcher/apps/gst-validate.py
+++ b/validate/tools/launcher/apps/gst-validate.py
@@ -168,6 +168,7 @@ G_V_SCENARIOS = ["play_15s",
                  "switch_subtitle_track",
                  "switch_subtitle_track_while_paused",
                  "disable_subtitle_track_while_paused",
+                 "change_state_intensive",
                  "scrub_forward_seeking"]
 
 G_V_PROTOCOL_VIDEO_RESTRICTION_CAPS = {