diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3bb622d..0be967d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -180,6 +180,18 @@ convert_raspbian_raspberrypi4:
     - curl -f -O https://mender.s3.amazonaws.com/mender-artifact/$MENDER_ARTIFACT_VERSION/linux/mender-artifact
     - chmod ugo+x mender-artifact
     - mv mender-artifact /usr/bin/
+    # Get Update Modules Artifact generators for the tests
+    - if [ "${MENDER_CLIENT_VERSION}" = "latest" ]; then
+    -   mender_version=master
+    - else
+    -   mender_version="${MENDER_CLIENT_VERSION}"
+    - fi
+    - curl -f -O https://raw.githubusercontent.com/mendersoftware/mender/${mender_version}/support/modules-artifact-gen/directory-artifact-gen
+    - chmod ugo+x directory-artifact-gen
+    - mv directory-artifact-gen /usr/bin/
+    - curl -f -O https://raw.githubusercontent.com/mendersoftware/mender/${mender_version}/support/modules-artifact-gen/single-file-artifact-gen
+    - chmod ugo+x single-file-artifact-gen
+    - mv single-file-artifact-gen /usr/bin/
   artifacts:
     expire_in: 2w
     when: always
diff --git a/tests/mender-image-tests b/tests/mender-image-tests
index a84e224..762ce89 160000
--- a/tests/mender-image-tests
+++ b/tests/mender-image-tests
@@ -1 +1 @@
-Subproject commit a84e22451c4401d9dfcbb9d04f0ff5aa9b2cca78
+Subproject commit 762ce89b764bf67db647827f8eb7923b707fc2fe