diff --git a/tests/applications/gnome-initial-setup/aaa_setup.pm b/tests/applications/gnome-initial-setup/aaa_setup.pm
index f052afe5..01f6b36f 100644
--- a/tests/applications/gnome-initial-setup/aaa_setup.pm
+++ b/tests/applications/gnome-initial-setup/aaa_setup.pm
@@ -15,6 +15,7 @@ sub run {
 
     # Remove the user clear the system and force the gnome-initial-setup
     # to start on new boot.
+    assert_script_run("loginctl terminate-user $username");
     assert_script_run("loginctl kill-user $username");
     # closing the user might switch us back to GDM, switch away if so
     $self->root_console(tty => 3) if (check_screen 'graphical_login', timeout => 30);