diff --git a/config/scenario_definitions.yaml b/config/scenario_definitions.yaml
index 0da6ee054cb50a0effb60aab83343303e76740ed..c6a0e3aa7e03e9d7b18396d2b5c21fb5ea778bf5 100644
--- a/config/scenario_definitions.yaml
+++ b/config/scenario_definitions.yaml
@@ -25,7 +25,6 @@ machines:
       QEMUCPUS: '2'
       QEMUPORT: '20012'
       QEMURAM: '2560'
-      QEMU_SMBIOS: 'type=11,path=/tests/config/smbios.txt'
       QEMU_VIDEO_DEVICE: virtio-vga
       UEFI: '1'
       UEFI_PFLASH_CODE: /usr/share/qemu/ovmf-x86_64-code.bin
@@ -39,24 +38,29 @@ job_templates:
     machine: qemu_x86_64
     settings:
       ISO: /installer.iso
+      QEMU_SMBIOS: 'type=11,path=/tests/config/smbios.txt'
   gnome_apps:
     product: gnomeos
     machine: qemu_x86_64
     settings:
       HDD_1: /disk.img
+      QEMU_SMBIOS: 'type=11,path=/tests/config/smbios.txt,value=io.systemd.credential:passwd.plaintext-password.testuser=testingtesting123,value=io.systemd.credential.binary:sysusers.extra=dSB0ZXN0dXNlciAtIHRlc3R1c2VyIC9ob21lL3Rlc3R1c2VyIC9iaW4vYmFzaAptIHRlc3R1c2VyIHdoZWVsCg==,value=io.systemd.credential.binary:tmpfiles.extra=QyAvaG9tZS90ZXN0dXNlciAtIC0gLSAtIC9ldGMvc2tlbApaIC9ob21lL3Rlc3R1c2VyIC0gdGVzdHVzZXIgdGVzdHVzZXIKdyt+IC9ldGMvZ2RtL2N1c3RvbS5jb25mIC0gLSAtIC0gVzJSaFpXMXZibDBLUVhWMGIyMWhkR2xqVEc5bmFXNUZibUZpYkdVOVZISjFaUXBCZFhSdmJXRjBhV05NYjJkcGJqMTBaWE4wZFhObGNnbz0K'
   gnome_accessibility:
     product: gnomeos
     machine: qemu_x86_64
     settings:
       HDD_1: /disk.img
+      QEMU_SMBIOS: 'type=11,path=/tests/config/smbios.txt,value=io.systemd.credential:passwd.plaintext-password.testuser=testingtesting123,value=io.systemd.credential.binary:sysusers.extra=dSB0ZXN0dXNlciAtIHRlc3R1c2VyIC9ob21lL3Rlc3R1c2VyIC9iaW4vYmFzaAptIHRlc3R1c2VyIHdoZWVsCg==,value=io.systemd.credential.binary:tmpfiles.extra=QyAvaG9tZS90ZXN0dXNlciAtIC0gLSAtIC9ldGMvc2tlbApaIC9ob21lL3Rlc3R1c2VyIC0gdGVzdHVzZXIgdGVzdHVzZXIKdyt+IC9ldGMvZ2RtL2N1c3RvbS5jb25mIC0gLSAtIC0gVzJSaFpXMXZibDBLUVhWMGIyMWhkR2xqVEc5bmFXNUZibUZpYkdVOVZISjFaUXBCZFhSdmJXRjBhV05NYjJkcGJqMTBaWE4wZFhObGNnbz0K'
   gnome_mobile:
     product: gnomeos
     machine: qemu_x86_64
     settings:
       HDD_1: /disk.img
+      QEMU_SMBIOS: 'type=11,path=/tests/config/smbios.txt,value=io.systemd.credential:passwd.plaintext-password.testuser=testingtesting123,value=io.systemd.credential.binary:sysusers.extra=dSB0ZXN0dXNlciAtIHRlc3R1c2VyIC9ob21lL3Rlc3R1c2VyIC9iaW4vYmFzaAptIHRlc3R1c2VyIHdoZWVsCg==,value=io.systemd.credential.binary:tmpfiles.extra=QyAvaG9tZS90ZXN0dXNlciAtIC0gLSAtIC9ldGMvc2tlbApaIC9ob21lL3Rlc3R1c2VyIC0gdGVzdHVzZXIgdGVzdHVzZXIKdyt+IC9ldGMvZ2RtL2N1c3RvbS5jb25mIC0gLSAtIC0gVzJSaFpXMXZibDBLUVhWMGIyMWhkR2xqVEc5bmFXNUZibUZpYkdVOVZISjFaUXBCZFhSdmJXRjBhV05NYjJkcGJqMTBaWE4wZFhObGNnbz0K'
   gnome_locales:
     product: gnomeos
     machine: qemu_x86_64
     settings:
       HDD_1: /disk.img
+      QEMU_SMBIOS: 'type=11,path=/tests/config/smbios.txt,value=io.systemd.credential:passwd.plaintext-password.testuser=testingtesting123,value=io.systemd.credential.binary:sysusers.extra=dSB0ZXN0dXNlciAtIHRlc3R1c2VyIC9ob21lL3Rlc3R1c2VyIC9iaW4vYmFzaAptIHRlc3R1c2VyIHdoZWVsCg==,value=io.systemd.credential.binary:tmpfiles.extra=QyAvaG9tZS90ZXN0dXNlciAtIC0gLSAtIC9ldGMvc2tlbApaIC9ob21lL3Rlc3R1c2VyIC0gdGVzdHVzZXIgdGVzdHVzZXIKdyt+IC9ldGMvZ2RtL2N1c3RvbS5jb25mIC0gLSAtIC0gVzJSaFpXMXZibDBLUVhWMGIyMWhkR2xqVEc5bmFXNUZibUZpYkdVOVZISjFaUXBCZFhSdmJXRjBhV05NYjJkcGJqMTBaWE4wZFhObGNnbz0K'
 
diff --git a/main.pm b/main.pm
index 032e1d870b6e4c92326213995ed93d45bc4b402d..aff538b7ab4bc3b4dfb237c4e552fdf688f0dd16 100644
--- a/main.pm
+++ b/main.pm
@@ -23,8 +23,6 @@ if ($testsuite eq "gnome_install") {
     autotest::loadtest("tests/gnome_shutdown.pm");
 } elsif ($testsuite eq "gnome_apps") {
     $testapi::form_factor_postfix = '';
-    autotest::loadtest("tests/gnome_welcome.pm");
-    autotest::loadtest("tests/gnome_disable_update_notification.pm");
     autotest::loadtest("tests/gnome_desktop.pm");
     autotest::loadtest("tests/gnome_audio.pm");
     autotest::loadtest("tests/app_baobab.pm");
@@ -59,8 +57,6 @@ if ($testsuite eq "gnome_install") {
 
 } elsif ($testsuite eq "gnome_accessibility") {
     $testapi::form_factor_postfix = '';
-    autotest::loadtest("tests/gnome_welcome.pm");
-    autotest::loadtest("tests/gnome_disable_update_notification.pm");
     autotest::loadtest("tests/gnome_desktop.pm");
     autotest::loadtest("tests/a11y_high_contrast.pm");
     autotest::loadtest("tests/a11y_large_text.pm");
@@ -76,8 +72,6 @@ if ($testsuite eq "gnome_install") {
     # Triggers resize_app_to_mobile function
     # changes which needle is selected
     $testapi::form_factor_postfix = '_mobile';
-    autotest::loadtest("tests/gnome_welcome.pm");
-    autotest::loadtest("tests/gnome_disable_update_notification.pm");
     autotest::loadtest("tests/gnome_desktop.pm");
     autotest::loadtest("tests/mobile_change_background_colour.pm");
     # This isn't showing a mobile form factor at all
diff --git a/utils/gdm.conf b/utils/gdm.conf
new file mode 100644
index 0000000000000000000000000000000000000000..31c5a5501a67d303057f3deb5c84061b8481edbd
--- /dev/null
+++ b/utils/gdm.conf
@@ -0,0 +1,3 @@
+[daemon]
+AutomaticLoginEnable=True
+AutomaticLogin=testuser
diff --git a/utils/get_smbios.sh b/utils/get_smbios.sh
index 49457129072baf78131aa627ff83cf606bb9ed76..ff6a89433ff7204786368af48d41ac392e6bbee3 100755
--- a/utils/get_smbios.sh
+++ b/utils/get_smbios.sh
@@ -4,6 +4,23 @@ set -eu
 
 script_dir="$(dirname $0)"
 
+gen_sysusers() {
+    cat <<EOF
+u testuser - testuser /home/testuser /bin/bash
+m testuser wheel
+EOF
+}
+
+gen_sysusers_tmpfiles() {
+    gdm_conf="$(cat "${script_dir}/gdm.conf" | base64 -w 0)"
+
+    cat <<EOF
+C /home/testuser - - - - /etc/skel
+Z /home/testuser - testuser testuser
+w+~ /etc/gdm/custom.conf - - - - ${gdm_conf}
+EOF
+}
+
 gen_tmpfiles() {
     # Kept as example if sudo is required in the future.
     sudoers_conf="$(cat "${script_dir}/sudoers.conf" | base64 -w 0)"
@@ -15,6 +32,17 @@ EOF
 
 configs=()
 
+# skip gnome-initial-setup and GDM login-screen
+if false; then
+  configs+=("value=io.systemd.credential:passwd.plaintext-password.testuser=testingtesting123")
+
+  sysusers_config="$(gen_sysusers | base64 -w 0)"
+  configs+=("value=io.systemd.credential.binary:sysusers.extra=${sysusers_config}")
+
+  tmpfiles_config="$(gen_sysusers_tmpfiles | base64 -w 0)"
+  configs+=("value=io.systemd.credential.binary:tmpfiles.extra=${tmpfiles_config}")
+fi
+
 # enable if sudo is needed
 if false; then
   tmpfiles_config="$(gen_tmpfiles | base64 -w 0)"