diff --git a/main.pm b/main.pm
index 65eaaf48..1cfbab62 100644
--- a/main.pm
+++ b/main.pm
@@ -175,6 +175,13 @@ sub load_install_tests() {
         autotest::loadtest "tests/_anaconda_network_enable.pm";
     }
 
+    ## Kdump
+    if (get_var('ANACONDA_KDUMP') eq 'enabled') {
+        autotest::loadtest "tests/_anaconda_kdump_enable.pm";
+    }
+    else {
+        autotest::loadtest "tests/_anaconda_kdump_disable.pm";
+    }
 
     ## Installation source
     if (get_var('MIRRORLIST_GRAPHICAL') || get_var("REPOSITORY_GRAPHICAL")) {
diff --git a/needles/kdump/rocky-anaconda_kdump_disable-20210813.json b/needles/kdump/rocky-anaconda_kdump_disable-20210813.json
new file mode 100644
index 00000000..181c41ca
--- /dev/null
+++ b/needles/kdump/rocky-anaconda_kdump_disable-20210813.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "xpos": 10,
+      "ypos": 130,
+      "width": 111,
+      "height": 26,
+      "type": "match",
+      "click_point": {
+        "xpos": 12.5,
+        "ypos": 13
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_kdump_disable"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kdump/rocky-anaconda_kdump_disable-20210813.png b/needles/kdump/rocky-anaconda_kdump_disable-20210813.png
new file mode 100644
index 00000000..ca14b0a0
Binary files /dev/null and b/needles/kdump/rocky-anaconda_kdump_disable-20210813.png differ
diff --git a/needles/kdump/rocky-anaconda_kdump_disabled-20210813.json b/needles/kdump/rocky-anaconda_kdump_disabled-20210813.json
new file mode 100644
index 00000000..11b448f1
--- /dev/null
+++ b/needles/kdump/rocky-anaconda_kdump_disabled-20210813.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 15,
+      "ypos": 136,
+      "width": 106,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_kdump_disabled"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kdump/rocky-anaconda_kdump_disabled-20210813.png b/needles/kdump/rocky-anaconda_kdump_disabled-20210813.png
new file mode 100644
index 00000000..c2359b0e
Binary files /dev/null and b/needles/kdump/rocky-anaconda_kdump_disabled-20210813.png differ
diff --git a/needles/kdump/rocky-anaconda_kdump_enable-20210813.json b/needles/kdump/rocky-anaconda_kdump_enable-20210813.json
new file mode 100644
index 00000000..3300564e
--- /dev/null
+++ b/needles/kdump/rocky-anaconda_kdump_enable-20210813.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "xpos": 10,
+      "ypos": 130,
+      "width": 111,
+      "height": 26,
+      "type": "match",
+      "click_point": {
+        "xpos": 12.5,
+        "ypos": 13
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_kdump_enable"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kdump/rocky-anaconda_kdump_enable-20210813.png b/needles/kdump/rocky-anaconda_kdump_enable-20210813.png
new file mode 100644
index 00000000..ca14b0a0
Binary files /dev/null and b/needles/kdump/rocky-anaconda_kdump_enable-20210813.png differ
diff --git a/needles/kdump/rocky-anaconda_main_hub_kdump-20210813.json b/needles/kdump/rocky-anaconda_main_hub_kdump-20210813.json
new file mode 100644
index 00000000..71ce92c2
--- /dev/null
+++ b/needles/kdump/rocky-anaconda_main_hub_kdump-20210813.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 719,
+      "ypos": 265,
+      "width": 16,
+      "height": 43,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_kdump"
+  ]
+}
\ No newline at end of file
diff --git a/needles/kdump/rocky-anaconda_main_hub_kdump-20210813.png b/needles/kdump/rocky-anaconda_main_hub_kdump-20210813.png
new file mode 100644
index 00000000..bbb61cc2
Binary files /dev/null and b/needles/kdump/rocky-anaconda_main_hub_kdump-20210813.png differ
diff --git a/tests/_anaconda_kdump_disable.pm b/tests/_anaconda_kdump_disable.pm
new file mode 100644
index 00000000..88a3567a
--- /dev/null
+++ b/tests/_anaconda_kdump_disable.pm
@@ -0,0 +1,21 @@
+use base "anacondatest";
+use strict;
+use testapi;
+use utils;
+use tapnet;
+
+sub run {
+    my $self = shift;
+    assert_and_click "anaconda_main_hub_kdump";
+    assert_and_click "anaconda_kdump_disable";
+    assert_screen "anaconda_kdump_disabled", 90;
+    assert_and_click "anaconda_spoke_done";
+}
+
+sub test_flags {
+    return { fatal => 1 };
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/_anaconda_kdump_enable.pm b/tests/_anaconda_kdump_enable.pm
new file mode 100644
index 00000000..5d0c55ae
--- /dev/null
+++ b/tests/_anaconda_kdump_enable.pm
@@ -0,0 +1,21 @@
+use base "anacondatest";
+use strict;
+use testapi;
+use utils;
+use tapnet;
+
+sub run {
+    my $self = shift;
+    assert_and_click "anaconda_main_hub_kdump";
+    assert_and_click "anaconda_kdump_enable";
+    assert_screen "anaconda_kdump_enabled", 90;
+    assert_and_click "anaconda_spoke_done";
+}
+
+sub test_flags {
+    return { fatal => 1 };
+}
+
+1;
+
+# vim: set sw=4 et: