diff --git a/ci/base.yml b/ci/base.yml
index a724db65..26fbb602 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -27,7 +27,6 @@ env:
 local_conf_header:
   base: |
     CONF_VERSION = "2"
-    LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA"
   setup: |
     PACKAGE_CLASSES = "package_ipk"
     PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
diff --git a/ci/fvp-baser-aemv8r64.yml b/ci/fvp-baser-aemv8r64.yml
index 40818bc6..cfaf9ef2 100644
--- a/ci/fvp-baser-aemv8r64.yml
+++ b/ci/fvp-baser-aemv8r64.yml
@@ -2,6 +2,6 @@ header:
   version: 11
   includes:
     - ci/base.yml
+    - ci/fvp.yml
 
 machine: fvp-baser-aemv8r64
-
diff --git a/ci/fvp.yml b/ci/fvp.yml
index a8f8dfc0..3803d8ca 100644
--- a/ci/fvp.yml
+++ b/ci/fvp.yml
@@ -3,9 +3,10 @@ header:
 
 local_conf_header:
   testimagefvp: |
+    LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA"
     INHERIT += "fvpboot"
+  failing_tests: |
     # This fails but we can't add to the ignorelist from meta-arm yet
     # https://bugzilla.yoctoproject.org/show_bug.cgi?id=14604
     TEST_SUITES:remove = "parselogs"
-  failing_tests: |
     TEST_SUITES:remove = "xorg"
diff --git a/ci/fvps.yml b/ci/fvps.yml
index 58c29d53..44c153ab 100644
--- a/ci/fvps.yml
+++ b/ci/fvps.yml
@@ -8,6 +8,8 @@ header:
 machine: qemuarm64
 
 local_conf_header:
+  license: |
+    LICENSE_FLAGS_ACCEPTED += "Arm-FVP-EULA"
   sdk: |
     SDKMACHINE = "x86_64"