diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f00bdcf8..4a2b3366 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,8 +109,10 @@ corstone700-fvp:
 corstone700-mps3:
   extends: .build
 
-fvp-base:
+fvp-base/testimage:
   extends: .build
+  tags:
+  - x86_64
 
 fvp-base-arm32:
   extends: .build
diff --git a/ci/fvp-base.yml b/ci/fvp-base.yml
index 1c3675fa..47d123e3 100644
--- a/ci/fvp-base.yml
+++ b/ci/fvp-base.yml
@@ -5,3 +5,12 @@ header:
 
 machine: fvp-base
 
+local_conf_header:
+  testimagefvp: |
+    INHERIT = "fvpboot"
+    # 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"
+    # Tell testimage to connect to localhost:8022, and forward that to SSH in the FVP.
+    TEST_TARGET_IP = "localhost:8022"
+    FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] ?= "8022=22"