diff --git a/templates.fif.json b/templates.fif.json
index 7f920d66..0d14f523 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -1199,6 +1199,17 @@
                 "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2"
             }
         },
+        "install_standard_partition_ext4": {
+            "profiles": {
+                "fedora-Server-dvd-iso-aarch64-*-aarch64": 30,
+                "fedora-Server-dvd-iso-ppc64le-*-ppc64le": 30,
+                "fedora-Server-dvd-iso-x86_64-*-64bit": 30
+            },
+            "settings": {
+                "PARTITIONING": "custom_standard_partition_ext4",
+                "ROOT_PASSWORD": "weakpassword"
+            }
+        },
         "install_mirrorlist_graphical": {
             "profiles": {
                 "fedora-universal-aarch64-*-aarch64": 20,
diff --git a/tests/disk_custom_standard_partition_ext4.pm b/tests/disk_custom_standard_partition_ext4.pm
new file mode 100644
index 00000000..adde6143
--- /dev/null
+++ b/tests/disk_custom_standard_partition_ext4.pm
@@ -0,0 +1,36 @@
+use base "anacondatest";
+use strict;
+use testapi;
+use anaconda;
+
+sub run {
+    my $self = shift;
+    # Go to INSTALLATION DESTINATION and ensure the disk is selected.
+    # Because PARTITIONING starts with 'custom_', this will select custom.
+    select_disks();
+    assert_and_click "anaconda_spoke_done";
+
+    # Manual partitioning spoke should be displayed. 
+    # Select the Standard Partitioning scheme
+    custom_scheme_select("standard");
+    # Do 'automatic' partition creation
+    assert_and_click "anaconda_part_automatic";
+    # Select ext4 as filesystems for partitions
+    custom_change_fs("ext4","root");
+    custom_change_fs("ext4","boot");
+    # Finish the settings
+    assert_and_click "anaconda_spoke_done";
+    assert_and_click "anaconda_part_accept_changes";
+
+    # Anaconda hub
+    assert_screen "anaconda_main_hub", 300; #
+
+}
+
+sub test_flags {
+    return { fatal => 1 };
+}
+
+1;
+
+# vim: set sw=4 et:
diff --git a/tests/disk_custom_standard_partition_ext4_postinstall.pm b/tests/disk_custom_standard_partition_ext4_postinstall.pm
new file mode 100644
index 00000000..8ba6eb8e
--- /dev/null
+++ b/tests/disk_custom_standard_partition_ext4_postinstall.pm
@@ -0,0 +1,21 @@
+use base "installedtest";
+use strict;
+use testapi;
+
+sub run {
+    assert_screen "root_console";
+    # check that there are two partitions 
+    validate_script_output 'fdisk -l | grep /dev/vda | wc -l', sub { $_ =~ m/3/ };
+    # check that vda2 is a boot partition and that the fs is ext4
+    validate_script_output 'mount | grep /dev/vda2', sub { $_ =~ m/on \/boot type ext4/ };
+    # check that vda1 is a root partition and that the fs is ext4
+    validate_script_output 'mount | grep /dev/vda1', sub { $_ =~ m/on \/ type ext4/ };
+}
+
+sub test_flags {
+    return { fatal => 1 };
+}
+
+1;
+
+# vim: set sw=4 et: