diff --git a/data/meson.build b/data/meson.build
index dcf1333..15c8648 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -24,25 +24,25 @@ if desktop_file_validate.found()
   )
 endif
 
-# Appdata
-appdata_conf = configuration_data()
-appdata_conf.set('app_id', app_id)
-appdata_file = i18n.merge_file(
-  input: '@0@.metainfo.xml.in'.format(app_id),
+appstream_conf = configure_file(
+  input: meson.project_name() + '.metainfo.xml.in',
+  output: '@0@.metainfo.xml.in'.format(app_id),
+  configuration: conf
+)
+
+appstream_file = i18n.merge_file(
+  input: appstream_conf,
   output: '@0@.metainfo.xml'.format(app_id),
   po_dir: '../po',
   install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo')
 )
-# Validate Appdata
-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
-  test(
-    'validate-appdata', appstream_util,
-    args: [
-      'validate', '--nonet', appdata_file.full_path()
-    ],
-    depends: appdata_file,
+
+#Validate Appstream file
+appstream_file_validate = find_program('appstream-util', required: false)
+if appstream_file_validate.found()
+  test('validate-appstream', appstream_file_validate,
+    args: ['validate', '--nonet', appstream_file]
   )
 endif