diff --git a/meta-iotqa/conf/test/refkit-image-common.manifest b/meta-iotqa/conf/test/refkit-image-common.manifest
index 5427506a22..1f12a6ecc4 100644
--- a/meta-iotqa/conf/test/refkit-image-common.manifest
+++ b/meta-iotqa/conf/test/refkit-image-common.manifest
@@ -5,8 +5,5 @@ oeqa.runtime.connectivity.services.managerdaemon
 oeqa.runtime.connectivity.bluetooth.btcheck
 oeqa.runtime.connectivity.wifi.wifi_connect
 oeqa.runtime.programming.python.apprt_python
-oeqa.runtime.peripherals.mraa.mraa_hello
-oeqa.runtime.peripherals.mraa.mraa_gpio
 oeqa.runtime.multimedia.audio.alsa
-oeqa.runtime.peripherals.upm.upm
 oeqa.runtime.sanity.nftables
diff --git a/meta-iotqa/conf/test/refkit-image-gateway.manifest b/meta-iotqa/conf/test/refkit-image-gateway.manifest
index 07dbc3868a..df0ee6543a 100644
--- a/meta-iotqa/conf/test/refkit-image-gateway.manifest
+++ b/meta-iotqa/conf/test/refkit-image-gateway.manifest
@@ -1,4 +1,7 @@
 # Tests for gateway profile
-oeqa.runtime.programming.nodejs.apprt_nodejs
 oeqa.runtime.core.iotivity.client
 oeqa.runtime.multimedia.audio.pulseaudio
+oeqa.runtime.peripherals.mraa.mraa_gpio
+oeqa.runtime.peripherals.mraa.mraa_hello
+oeqa.runtime.peripherals.upm.upm
+oeqa.runtime.programming.nodejs.apprt_nodejs
diff --git a/meta-refkit-core/classes/refkit-image.bbclass b/meta-refkit-core/classes/refkit-image.bbclass
index 0becc04d30..fb20176a32 100644
--- a/meta-refkit-core/classes/refkit-image.bbclass
+++ b/meta-refkit-core/classes/refkit-image.bbclass
@@ -145,7 +145,6 @@ REFKIT_IMAGE_FEATURES_COMMON ?= " \
     connectivity \
     ssh-server-openssh \
     alsa \
-    sensors \
     ${@ 'common-test' if (d.getVar('IMAGE_MODE') or 'production') != 'production' else '' } \
 "
 REFKIT_IMAGE_INSTALL_COMMON ?= ""
diff --git a/meta-refkit-core/lib/oeqa/selftest/cases/image_installer.py b/meta-refkit-core/lib/oeqa/selftest/cases/image_installer.py
index abaa5cd2e3..b06747834a 100644
--- a/meta-refkit-core/lib/oeqa/selftest/cases/image_installer.py
+++ b/meta-refkit-core/lib/oeqa/selftest/cases/image_installer.py
@@ -96,7 +96,7 @@ def do_install(self, fixed_password="", tpm=False):
         with runqemu('refkit-installer-image', ssh=False,
                      discard_writes=False,
                      qemuparams='-drive if=virtio,file=%s/internal-image-%s.wic,format=raw%s' % (self.resultdir, self.image_arch, qemuparams_tpm),
-                     runqemuparams='ovmf slirp',
+                     runqemuparams='ovmf slirp nographic',
                      image_fstype='wic') as qemu:
             # Check that we have booted, with dm-verity if enabled.
             cmd = "findmnt / --output SOURCE --noheadings"
@@ -126,7 +126,7 @@ def do_install(self, fixed_password="", tpm=False):
         with runqemu('refkit-installer-image', ssh=False,
                      overrides=overrides,
                      qemuparams=qemuparams_tpm,
-                     runqemuparams='ovmf slirp',
+                     runqemuparams='ovmf slirp nographic',
                      image_fstype='wic') as qemu:
             # Check that we have booted, without device mapper involved.
             # Can't use the simpler findmnt here.
diff --git a/meta-refkit-gateway/recipes-image/images/refkit-image-gateway.bb b/meta-refkit-gateway/recipes-image/images/refkit-image-gateway.bb
index 831d4a2bb3..e1ef5db79c 100644
--- a/meta-refkit-gateway/recipes-image/images/refkit-image-gateway.bb
+++ b/meta-refkit-gateway/recipes-image/images/refkit-image-gateway.bb
@@ -6,7 +6,12 @@ REFKIT_IMAGE_GATEWAY_EXTRA_INSTALL ?= "${REFKIT_IMAGE_INSTALL_COMMON}"
 REFKIT_IMAGE_EXTRA_FEATURES += "${REFKIT_IMAGE_GATEWAY_EXTRA_FEATURES}"
 REFKIT_IMAGE_EXTRA_INSTALL += "${REFKIT_IMAGE_GATEWAY_EXTRA_INSTALL}"
 
-REFKIT_IMAGE_GATEWAY_EXTRA_FEATURES_append = " iotivity nodejs-runtime bluetooth-audio"
+REFKIT_IMAGE_GATEWAY_EXTRA_FEATURES += " \
+    bluetooth-audio \
+    iotivity \
+    nodejs-runtime \
+    sensors \
+"
 
 # Example for customization in local.conf when building
 # refkit-image-gateway.bb: