diff --git a/src/intel/decoder/tests/gentest.xml b/src/intel/decoder/tests/gentest.xml
index 75a944365a3..2b4af514a7a 100644
--- a/src/intel/decoder/tests/gentest.xml
+++ b/src/intel/decoder/tests/gentest.xml
@@ -1,20 +1,17 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="SKL" gen="9">
-
-  <struct name="TEST_STRUCT" length="2">
-    <field name="number1" start="0" end="15" type="uint"/>
-    <field name="number2" start="16" end="31" type="uint"/>
-    <group count="4" start="32" size="8">
-       <field name="byte" start="0" end="7" type="uint"/>
-    </group>
-  </struct>
-
   <struct name="STRUCT_TWO_LEVELS" length="8">
     <group count="4" start="0" size="64">
-       <group count="8" start="0" size="8">
-          <field name="byte" start="0" end="7" type="uint"/>
-       </group>
+      <group count="8" start="0" size="8">
+        <field name="byte" start="0" end="7" type="uint" />
+      </group>
+    </group>
+  </struct>
+  <struct name="TEST_STRUCT" length="2">
+    <field name="number1" start="0" end="15" type="uint" />
+    <field name="number2" start="16" end="31" type="uint" />
+    <group count="4" start="32" size="8">
+      <field name="byte" start="0" end="7" type="uint" />
     </group>
   </struct>
-
 </genxml>
diff --git a/src/intel/genxml/meson.build b/src/intel/genxml/meson.build
index 379082119ec..72edd425c7d 100644
--- a/src/intel/genxml/meson.build
+++ b/src/intel/genxml/meson.build
@@ -155,7 +155,9 @@ idep_genxml = declare_dependency(
   sources : [gen_xml_pack, gen_xml_video_pack, gen_cl_xml_pack, genX_bits_h, genX_xml_h]
 )
 
-foreach f : gen_xml_files + gen_xml_rt_files
+gen_xml_test_files = ['../decoder/tests/gentest.xml']
+
+foreach f : gen_xml_files + gen_xml_rt_files + gen_xml_test_files
   test(
     'genxml sort @0@'.format(f),
     prog_python,