diff --git a/tests/check/ges/audio_only.ogg b/tests/check/assets/audio_only.ogg
similarity index 100%
rename from tests/check/ges/audio_only.ogg
rename to tests/check/assets/audio_only.ogg
diff --git a/tests/check/ges/audio_video.ogg b/tests/check/assets/audio_video.ogg
similarity index 100%
rename from tests/check/ges/audio_video.ogg
rename to tests/check/assets/audio_video.ogg
diff --git a/tests/check/ges/image.png b/tests/check/assets/image.png
similarity index 100%
rename from tests/check/ges/image.png
rename to tests/check/assets/image.png
diff --git a/tests/check/ges/test-auto-transition.xges b/tests/check/assets/test-auto-transition.xges
similarity index 100%
rename from tests/check/ges/test-auto-transition.xges
rename to tests/check/assets/test-auto-transition.xges
diff --git a/tests/check/ges/test-project.xges b/tests/check/assets/test-project.xges
similarity index 100%
rename from tests/check/ges/test-project.xges
rename to tests/check/assets/test-project.xges
diff --git a/tests/check/ges/test-properties.xges b/tests/check/assets/test-properties.xges
similarity index 100%
rename from tests/check/ges/test-properties.xges
rename to tests/check/assets/test-properties.xges
diff --git a/tests/check/ges/test-utils.c b/tests/check/ges/test-utils.c
index 862d487462..fb0589794b 100644
--- a/tests/check/ges/test-utils.c
+++ b/tests/check/ges/test-utils.c
@@ -31,20 +31,7 @@ typedef struct _DestroyedObjectStruct
 gchar *
 ges_test_get_audio_only_uri (void)
 {
-  gchar *uri;
-  GFile *cfile, *fdir, *f_audio_only;
-
-  cfile = g_file_new_for_path (__FILE__);
-  fdir = g_file_get_parent (cfile);
-
-  f_audio_only = g_file_get_child (fdir, "audio_only.ogg");
-  uri = g_file_get_uri (f_audio_only);
-
-  gst_object_unref (cfile);
-  gst_object_unref (fdir);
-  gst_object_unref (f_audio_only);
-
-  return uri;
+  return ges_test_file_uri ("audio_only.ogg");
 }
 
 gchar *
diff --git a/tests/check/meson.build b/tests/check/meson.build
index 98d9bc6d70..08196ed65f 100644
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -28,7 +28,7 @@ ges_tests = [
 test_defines = [
   '-UG_DISABLE_ASSERT',
   '-UG_DISABLE_CAST_CHECKS',
-  '-DGES_TEST_FILES_PATH="' + meson.current_source_dir() + '/ges/"',
+  '-DGES_TEST_FILES_PATH="@0@"'.format(join_paths(meson.current_source_dir(), 'assets')),
   '-DGST_CHECK_TEST_ENVIRONMENT_BEACON="GST_STATE_IGNORE_ELEMENTS"',
   '-DTESTFILE="' + meson.current_source_dir() + '/meson.build"',
   '-DGST_USE_UNSTABLE_API',
diff --git a/tests/check/python/test_clip.py b/tests/check/python/test_clip.py
index 31076fc281..058a4a6168 100644
--- a/tests/check/python/test_clip.py
+++ b/tests/check/python/test_clip.py
@@ -146,8 +146,7 @@ class TestTitleClip(unittest.TestCase):
 
 class TestUriClip(common.GESSimpleTimelineTest):
     def test_max_duration_on_extract(self):
-        uri = Gst.filename_to_uri(os.path.join(__file__, "../../ges/audio_video.ogg"))
-        asset = GES.UriClipAsset.request_sync(uri)
+        asset = GES.UriClipAsset.request_sync(common.get_asset_uri("audio_video.ogg"))
         clip = asset.extract()
 
         self.assertEqual(clip.props.max_duration, Gst.SECOND)