diff --git a/data/yam/agama/auto/gnome_tumbleweed.json b/data/yam/agama/auto/gnome_tumbleweed.json
new file mode 100644
index 000000000000..f6ab87301fe7
--- /dev/null
+++ b/data/yam/agama/auto/gnome_tumbleweed.json
@@ -0,0 +1,40 @@
+{
+  "product": {
+    "id": "Tumbleweed"
+  },
+  "software": {
+    "patterns": [
+      "gnome"
+    ]
+  },
+  "user": {
+    "fullName": "Bernhard M. Wiedemann",
+    "password": "nots3cr3t",
+    "userName": "bernhard"
+  },
+  "root": {
+    "password": "nots3cr3t"
+  },
+  "storage": {
+    "guided": {
+      "boot": { "configure": true }
+    },
+    "drives": [
+      {
+        "ptable_type": "gpt",
+        "partitions": [
+          {
+            "size": "40GiB",
+            "format": { "filesystem": "btrfs" },
+            "mount": { "path": "/" }
+          },
+          {
+            "size": "20GiB",
+            "format": { "filesystem": "xfs" },
+            "mount": { "path": "/home" }
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/data/yam/agama/auto/gnome_tumbleweed_autosize.json b/data/yam/agama/auto/gnome_tumbleweed_autosize.json
new file mode 100644
index 000000000000..db75d38e6224
--- /dev/null
+++ b/data/yam/agama/auto/gnome_tumbleweed_autosize.json
@@ -0,0 +1,18 @@
+{
+  "product": {
+    "id": "Tumbleweed"
+  },
+  "software": {
+    "patterns": [
+      "gnome"
+    ]
+  },
+  "user": {
+    "fullName": "Bernhard M. Wiedemann",
+    "password": "nots3cr3t",
+    "userName": "bernhard"
+  },
+  "root": {
+    "password": "nots3cr3t"
+  }
+}
diff --git a/schedule/yam/agama.yaml b/schedule/yam/agama.yaml
index 94a0ff36af80..9751d73c4618 100644
--- a/schedule/yam/agama.yaml
+++ b/schedule/yam/agama.yaml
@@ -6,7 +6,7 @@ schedule:
   - yam/agama/boot_agama
   - yam/agama/patch_agama_tests
   - yam/agama/agama
-  - yam/agama/agama_grub2
+  - installation/grub_test
   - installation/first_boot
   - yam/validate/validate_product
   - yam/validate/validate_first_user
diff --git a/tests/yam/agama/agama_auto.pm b/tests/yam/agama/agama_auto.pm
index 0e1dbae5914c..f010d113e171 100644
--- a/tests/yam/agama/agama_auto.pm
+++ b/tests/yam/agama/agama_auto.pm
@@ -14,7 +14,7 @@ use testapi;
 sub run {
     my $reboot_page = $testapi::distri->get_reboot_page();
 
-    $reboot_page->expect_is_shown(timeout => 1200);
+    $reboot_page->expect_is_shown(timeout => 3600);
 
     select_console 'root-console';
     Yam::Agama::agama_base::upload_agama_logs();