diff --git a/validate/configure.ac b/validate/configure.ac
index a4b79825a0..4ff386992a 100644
--- a/validate/configure.ac
+++ b/validate/configure.ac
@@ -289,6 +289,7 @@ Makefile
 common/Makefile
 common/m4/Makefile
 data/Makefile
+data/scenarios/Makefile
 gst/Makefile
 gst/validate/Makefile
 gst/preload/Makefile
diff --git a/validate/data/Makefile.am b/validate/data/Makefile.am
index 020c8cf61d..44ba117e2f 100644
--- a/validate/data/Makefile.am
+++ b/validate/data/Makefile.am
@@ -1,52 +1 @@
-scenariosdir=${datadir}/gstreamer-$(GST_API_VERSION)/validate/scenarios
-scenarios_DATA = simple_seeks.scenario \
-                 seek_forward.scenario \
-                 seek_backward.scenario \
-                 seek_forward_backward.scenario \
-                 reverse_playback.scenario \
-                 fast_forward.scenario \
-                 fast_backward.scenario \
-                 alternate_fast_backward_forward.scenario \
-                 pause_resume.scenario \
-                 scrub_forward_seeking.scenario \
-                 scrub_backward_seeking.scenario \
-                 scrub_forward_seeking_full.scenario \
-                 scrub_backward_seeking_full.scenario \
-                 adaptive_video_size.scenario \
-                 adaptive_video_framerate.scenario \
-                 adaptive_video_framerate_size.scenario\
-                 force_key_unit.scenario\
-                 seek_with_stop.scenario\
-                 switch_audio_track_while_paused.scenario\
-                 switch_subtitle_track.scenario\
-                 switch_subtitle_track_while_paused.scenario\
-                 disable_subtitle_track_while_paused.scenario\
-                 change_state_intensive.scenario\
-                 play_15s.scenario \
-                 switch_audio_track.scenario
-
-EXTRA_DIST = simple_seeks.scenario \
-             seek_forward.scenario \
-             seek_backward.scenario \
-             seek_forward_backward.scenario \
-             reverse_playback.scenario \
-             fast_forward.scenario \
-             fast_backward.scenario \
-             alternate_fast_backward_forward.scenario \
-             pause_resume.scenario \
-             scrub_forward_seeking.scenario \
-             scrub_backward_seeking.scenario \
-             scrub_forward_seeking_full.scenario \
-             scrub_backward_seeking_full.scenario \
-             adaptive_video_size.scenario \
-             adaptive_video_framerate.scenario \
-             adaptive_video_framerate_size.scenario\
-             force_key_unit.scenario\
-             seek_with_stop.scenario\
-             switch_audio_track_while_paused.scenario\
-             switch_subtitle_track.scenario\
-             switch_subtitle_track_while_paused.scenario\
-             disable_subtitle_track_while_paused.scenario\
-             play_15s.scenario \
-             change_state_intensive.scenario\
-             switch_audio_track.scenario
+SUBDIRS = scenarios
diff --git a/validate/data/scenarios/Makefile.am b/validate/data/scenarios/Makefile.am
new file mode 100644
index 0000000000..020c8cf61d
--- /dev/null
+++ b/validate/data/scenarios/Makefile.am
@@ -0,0 +1,52 @@
+scenariosdir=${datadir}/gstreamer-$(GST_API_VERSION)/validate/scenarios
+scenarios_DATA = simple_seeks.scenario \
+                 seek_forward.scenario \
+                 seek_backward.scenario \
+                 seek_forward_backward.scenario \
+                 reverse_playback.scenario \
+                 fast_forward.scenario \
+                 fast_backward.scenario \
+                 alternate_fast_backward_forward.scenario \
+                 pause_resume.scenario \
+                 scrub_forward_seeking.scenario \
+                 scrub_backward_seeking.scenario \
+                 scrub_forward_seeking_full.scenario \
+                 scrub_backward_seeking_full.scenario \
+                 adaptive_video_size.scenario \
+                 adaptive_video_framerate.scenario \
+                 adaptive_video_framerate_size.scenario\
+                 force_key_unit.scenario\
+                 seek_with_stop.scenario\
+                 switch_audio_track_while_paused.scenario\
+                 switch_subtitle_track.scenario\
+                 switch_subtitle_track_while_paused.scenario\
+                 disable_subtitle_track_while_paused.scenario\
+                 change_state_intensive.scenario\
+                 play_15s.scenario \
+                 switch_audio_track.scenario
+
+EXTRA_DIST = simple_seeks.scenario \
+             seek_forward.scenario \
+             seek_backward.scenario \
+             seek_forward_backward.scenario \
+             reverse_playback.scenario \
+             fast_forward.scenario \
+             fast_backward.scenario \
+             alternate_fast_backward_forward.scenario \
+             pause_resume.scenario \
+             scrub_forward_seeking.scenario \
+             scrub_backward_seeking.scenario \
+             scrub_forward_seeking_full.scenario \
+             scrub_backward_seeking_full.scenario \
+             adaptive_video_size.scenario \
+             adaptive_video_framerate.scenario \
+             adaptive_video_framerate_size.scenario\
+             force_key_unit.scenario\
+             seek_with_stop.scenario\
+             switch_audio_track_while_paused.scenario\
+             switch_subtitle_track.scenario\
+             switch_subtitle_track_while_paused.scenario\
+             disable_subtitle_track_while_paused.scenario\
+             play_15s.scenario \
+             change_state_intensive.scenario\
+             switch_audio_track.scenario
diff --git a/validate/data/adaptive_video_framerate.scenario b/validate/data/scenarios/adaptive_video_framerate.scenario
similarity index 100%
rename from validate/data/adaptive_video_framerate.scenario
rename to validate/data/scenarios/adaptive_video_framerate.scenario
diff --git a/validate/data/adaptive_video_framerate_size.scenario b/validate/data/scenarios/adaptive_video_framerate_size.scenario
similarity index 100%
rename from validate/data/adaptive_video_framerate_size.scenario
rename to validate/data/scenarios/adaptive_video_framerate_size.scenario
diff --git a/validate/data/adaptive_video_size.scenario b/validate/data/scenarios/adaptive_video_size.scenario
similarity index 100%
rename from validate/data/adaptive_video_size.scenario
rename to validate/data/scenarios/adaptive_video_size.scenario
diff --git a/validate/data/alternate_fast_backward_forward.scenario b/validate/data/scenarios/alternate_fast_backward_forward.scenario
similarity index 100%
rename from validate/data/alternate_fast_backward_forward.scenario
rename to validate/data/scenarios/alternate_fast_backward_forward.scenario
diff --git a/validate/data/camerabin_signal.scenario b/validate/data/scenarios/camerabin_signal.scenario
similarity index 100%
rename from validate/data/camerabin_signal.scenario
rename to validate/data/scenarios/camerabin_signal.scenario
diff --git a/validate/data/change_state_intensive.scenario b/validate/data/scenarios/change_state_intensive.scenario
similarity index 100%
rename from validate/data/change_state_intensive.scenario
rename to validate/data/scenarios/change_state_intensive.scenario
diff --git a/validate/data/disable_subtitle_track_while_paused.scenario b/validate/data/scenarios/disable_subtitle_track_while_paused.scenario
similarity index 100%
rename from validate/data/disable_subtitle_track_while_paused.scenario
rename to validate/data/scenarios/disable_subtitle_track_while_paused.scenario
diff --git a/validate/data/fast_backward.scenario b/validate/data/scenarios/fast_backward.scenario
similarity index 100%
rename from validate/data/fast_backward.scenario
rename to validate/data/scenarios/fast_backward.scenario
diff --git a/validate/data/fast_forward.scenario b/validate/data/scenarios/fast_forward.scenario
similarity index 100%
rename from validate/data/fast_forward.scenario
rename to validate/data/scenarios/fast_forward.scenario
diff --git a/validate/data/force_key_unit.scenario b/validate/data/scenarios/force_key_unit.scenario
similarity index 100%
rename from validate/data/force_key_unit.scenario
rename to validate/data/scenarios/force_key_unit.scenario
diff --git a/validate/data/pause_resume.scenario b/validate/data/scenarios/pause_resume.scenario
similarity index 100%
rename from validate/data/pause_resume.scenario
rename to validate/data/scenarios/pause_resume.scenario
diff --git a/validate/data/play_15s.scenario b/validate/data/scenarios/play_15s.scenario
similarity index 100%
rename from validate/data/play_15s.scenario
rename to validate/data/scenarios/play_15s.scenario
diff --git a/validate/data/reverse_playback.scenario b/validate/data/scenarios/reverse_playback.scenario
similarity index 100%
rename from validate/data/reverse_playback.scenario
rename to validate/data/scenarios/reverse_playback.scenario
diff --git a/validate/data/scrub_backward_seeking.scenario b/validate/data/scenarios/scrub_backward_seeking.scenario
similarity index 100%
rename from validate/data/scrub_backward_seeking.scenario
rename to validate/data/scenarios/scrub_backward_seeking.scenario
diff --git a/validate/data/scrub_backward_seeking_full.scenario b/validate/data/scenarios/scrub_backward_seeking_full.scenario
similarity index 100%
rename from validate/data/scrub_backward_seeking_full.scenario
rename to validate/data/scenarios/scrub_backward_seeking_full.scenario
diff --git a/validate/data/scrub_forward_seeking.scenario b/validate/data/scenarios/scrub_forward_seeking.scenario
similarity index 100%
rename from validate/data/scrub_forward_seeking.scenario
rename to validate/data/scenarios/scrub_forward_seeking.scenario
diff --git a/validate/data/scrub_forward_seeking_full.scenario b/validate/data/scenarios/scrub_forward_seeking_full.scenario
similarity index 100%
rename from validate/data/scrub_forward_seeking_full.scenario
rename to validate/data/scenarios/scrub_forward_seeking_full.scenario
diff --git a/validate/data/seek_backward.scenario b/validate/data/scenarios/seek_backward.scenario
similarity index 100%
rename from validate/data/seek_backward.scenario
rename to validate/data/scenarios/seek_backward.scenario
diff --git a/validate/data/seek_forward.scenario b/validate/data/scenarios/seek_forward.scenario
similarity index 100%
rename from validate/data/seek_forward.scenario
rename to validate/data/scenarios/seek_forward.scenario
diff --git a/validate/data/seek_forward_backward.scenario b/validate/data/scenarios/seek_forward_backward.scenario
similarity index 100%
rename from validate/data/seek_forward_backward.scenario
rename to validate/data/scenarios/seek_forward_backward.scenario
diff --git a/validate/data/seek_with_stop.scenario b/validate/data/scenarios/seek_with_stop.scenario
similarity index 100%
rename from validate/data/seek_with_stop.scenario
rename to validate/data/scenarios/seek_with_stop.scenario
diff --git a/validate/data/simple_seeks.scenario b/validate/data/scenarios/simple_seeks.scenario
similarity index 100%
rename from validate/data/simple_seeks.scenario
rename to validate/data/scenarios/simple_seeks.scenario
diff --git a/validate/data/switch_audio_track.scenario b/validate/data/scenarios/switch_audio_track.scenario
similarity index 100%
rename from validate/data/switch_audio_track.scenario
rename to validate/data/scenarios/switch_audio_track.scenario
diff --git a/validate/data/switch_audio_track_while_paused.scenario b/validate/data/scenarios/switch_audio_track_while_paused.scenario
similarity index 100%
rename from validate/data/switch_audio_track_while_paused.scenario
rename to validate/data/scenarios/switch_audio_track_while_paused.scenario
diff --git a/validate/data/switch_set_external_subtitle.scenario b/validate/data/scenarios/switch_set_external_subtitle.scenario
similarity index 100%
rename from validate/data/switch_set_external_subtitle.scenario
rename to validate/data/scenarios/switch_set_external_subtitle.scenario
diff --git a/validate/data/switch_subtitle_track.scenario b/validate/data/scenarios/switch_subtitle_track.scenario
similarity index 100%
rename from validate/data/switch_subtitle_track.scenario
rename to validate/data/scenarios/switch_subtitle_track.scenario
diff --git a/validate/data/switch_subtitle_track_while_paused.scenario b/validate/data/scenarios/switch_subtitle_track_while_paused.scenario
similarity index 100%
rename from validate/data/switch_subtitle_track_while_paused.scenario
rename to validate/data/scenarios/switch_subtitle_track_while_paused.scenario
diff --git a/validate/data/update_start.scenario b/validate/data/scenarios/update_start.scenario
similarity index 100%
rename from validate/data/update_start.scenario
rename to validate/data/scenarios/update_start.scenario
diff --git a/validate/data/update_stop.scenario b/validate/data/scenarios/update_stop.scenario
similarity index 100%
rename from validate/data/update_stop.scenario
rename to validate/data/scenarios/update_stop.scenario
diff --git a/validate/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c
index ce756e922c..efc6051d21 100644
--- a/validate/gst/validate/gst-validate-scenario.c
+++ b/validate/gst/validate/gst-validate-scenario.c
@@ -2091,7 +2091,7 @@ gst_validate_scenario_load (GstValidateScenario * scenario,
     lfilename =
         g_strdup_printf ("%s" GST_VALIDATE_SCENARIO_SUFFIX, scenarios[i]);
 
-    tldir = g_build_filename ("data/", lfilename, NULL);
+    tldir = g_build_filename ("data", "scenarios", lfilename, NULL);
 
     if ((ret = _load_scenario_file (scenario, tldir, &is_config)))
       goto check_scenario;
@@ -2566,7 +2566,7 @@ gst_validate_list_scenarios (gchar ** scenarios, gint num_scenarios,
   }
 
   /* Hack to make it work uninstalled */
-  dir = g_file_new_for_path ("data/");
+  dir = g_file_new_for_path ("data/scenarios");
   _list_scenarios_in_dir (dir, kf);
   g_object_unref (dir);