diff --git a/templates.fif.json b/templates.fif.json
index c916edd2..fb39522b 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -1529,8 +1529,7 @@
                 "fedora-i3-live-x86_64-*-64bit": 70
             },
             "settings": {
-                "ENTRY_POINT": "_graphical_wait_login _collect_data uefi_postinstall _console_shutdown",
-                "INSTALL_NO_USER": "1",
+                "ENTRY_POINT": "_postinstall_usb _graphical_wait_login",
                 "PACKAGE_SET": "default",
                 "START_AFTER_TEST":"install_usb_upload",
                 "HDD_1": "usbdisk_%FLAVOR%_%MACHINE%.qcow2",
diff --git a/tests/_postinstall_usb.pm b/tests/_postinstall_usb.pm
new file mode 100644
index 00000000..920364a0
--- /dev/null
+++ b/tests/_postinstall_usb.pm
@@ -0,0 +1,22 @@
+use base "installedtest";
+use strict;
+use testapi;
+use anaconda;
+use utils;
+
+
+sub run {
+    my $self = shift;
+    my $desktop = get_var("DESKTOP");
+    if ($desktop eq "gnome") {
+        set_var("INSTALL_NO_USER", "1", reload_needles => 1);
+    }
+}
+
+sub test_flags {
+    return {fatal => 1};
+}
+
+1;
+
+# vim: set sw=4 et: