diff --git a/schedule/install/agama_install.yaml b/schedule/install/agama_install.yaml
index b529dbc1d121..f9bb54cb4603 100644
--- a/schedule/install/agama_install.yaml
+++ b/schedule/install/agama_install.yaml
@@ -4,6 +4,7 @@ description:    >
 schedule:
   - installation/bootloader
   - installation/agama
+  - installation/grub_test
   - installation/first_boot
   - installation/opensuse_welcome
   - console/system_prepare
diff --git a/tests/installation/agama.pm b/tests/installation/agama.pm
index 4ef5f0a9fd17..e1484d53dcf1 100644
--- a/tests/installation/agama.pm
+++ b/tests/installation/agama.pm
@@ -192,6 +192,11 @@ sub run {
     reset_consoles();
     assert_and_click('agama-reboot-after-install');
 
+    # workaround for lack of disable bootloader timeout
+    # https://github.com/openSUSE/agama/issues/1594
+    # simply send space until we hit grub2
+    send_key_until_needlematch("bootloader-grub2", 'spc', 50, 3);
+
 }
 
 =head2 post_fail_hook