diff --git a/meson.build b/meson.build
index 50dfad0b3..e0846a661 100644
--- a/meson.build
+++ b/meson.build
@@ -60,7 +60,7 @@ install_man(
   install_dir: join_paths(mandir, 'man1'),
 )
 
-i18n.merge_file(
+desktop_file = i18n.merge_file(
   input: files('share/applications/net.lutris.Lutris.desktop'),
   output: 'net.lutris.Lutris.desktop',
   type: 'desktop',
@@ -69,7 +69,17 @@ i18n.merge_file(
   install_dir: join_paths(datadir, 'applications'),
 )
 
-i18n.merge_file(
+# Validate the desktop file
+desktop_file_validate = find_program('desktop-file-validate', required:false)
+if desktop_file_validate.found()
+  test (
+    'Validate desktop file',
+    desktop_file_validate,
+    args: [ desktop_file.full_path() ],
+  )
+endif
+
+metainfo_file = i18n.merge_file(
   input: files('share/metainfo/net.lutris.Lutris.metainfo.xml'),
   output: 'net.lutris.Lutris.metainfo.xml',
   type: 'xml',
@@ -77,3 +87,13 @@ i18n.merge_file(
   install: true,
   install_dir: join_paths(datadir, 'metainfo'),
 )
+
+# Validate the metainfo file
+appstreamcli = find_program('appstream-util', required: false)
+if appstreamcli.found()
+  test (
+    'Validate metainfo file',
+    appstreamcli,
+    args: ['validate-relax', '--nonet', metainfo_file.full_path() ]
+  )
+endif