From: Karel Zak <kzak@redhat.com>
Date: Tue, 24 Mar 2020 13:30:16 +0000 (+0100)
Subject: tests: cleanup fdisk based stuff
X-Git-Tag: v2.36-rc1~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7db499f1c12712f31aaaf5f8b0d594b3b8c40de;p=thirdparty%2Futil-linux.git

tests: cleanup fdisk based stuff

* use fdisk --noauto-pt to avoid re-creation of the default architecture specific PT
* use more verbose "Created a new" messages in the output

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole
index cc0b17f83e..5ef99b6450 100644
--- a/tests/expected/blkid/md-raid0-whole
+++ b/tests/expected/blkid/md-raid0-whole
@@ -11,13 +11,13 @@ Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-204543, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-204543, default 204543): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-204543, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-204543, default 204543): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 99.9 MiB, 104726528 bytes, 204544 sectors
 Units: sectors of 1 * 512 = 512 bytes
diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part
index b568edbd11..6841988274 100644
--- a/tests/expected/blkid/md-raid1-part
+++ b/tests/expected/blkid/md-raid1-part
@@ -5,19 +5,20 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-Created a new <removed>.
+
+Command (m for help): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-104447, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-104447, default 104447): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (53248-104447, default 53248): Last sector, +/-sectors or +/-size{K,M,G,T,P} (53248-104447, default 104447): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 51 MiB, 53477376 bytes, 104448 sectors
 Disk model: scsi_debug      
diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole
index 6334ae1149..60d3b877df 100644
--- a/tests/expected/blkid/md-raid1-whole
+++ b/tests/expected/blkid/md-raid1-whole
@@ -11,13 +11,13 @@ Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102271, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102271, default 102271): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-102271, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-102271, default 102271): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk /dev/md8: 49.96 MiB, 52363264 bytes, 102272 sectors
 Units: sectors of 1 * 512 = 512 bytes
diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K
index e6aa145c9d..ec066136a3 100644
--- a/tests/expected/fdisk/align-512-4K
+++ b/tests/expected/fdisk/align-512-4K
@@ -5,25 +5,26 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-Created a new <removed>.
+
+Command (m for help): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +/-sectors or +/-size{K,M,G,T,P} (43008-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
@@ -31,22 +32,22 @@ Command (m for help): Partition type
 Select (default e): 
 Selected partition 4
 First sector (63488-102399, default 63488): Last sector, +/-sectors or +/-size{K,M,G,T,P} (63488-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 5
 First sector (65536-102399, default 65536): Last sector, +/-sectors or +/-size{K,M,G,T,P} (65536-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 6
 First sector (77824-102399, default 77824): Last sector, +/-sectors or +/-size{K,M,G,T,P} (77824-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 7
 First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K,M,G,T,P} (90112-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Disk model: scsi_debug      
diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63
index 831e7dc989..f7a0c9f6e8 100644
--- a/tests/expected/fdisk/align-512-4K-63
+++ b/tests/expected/fdisk/align-512-4K-63
@@ -5,25 +5,26 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-Created a new <removed>.
+
+Command (m for help): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (7-102399, default 7): Last sector, +/-sectors or +/-size{K,M,G,T,P} (7-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (20487-102399, default 20487): Last sector, +/-sectors or +/-size{K,M,G,T,P} (20487-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (3,4, default 3): First sector (40967-102399, default 40967): Last sector, +/-sectors or +/-size{K,M,G,T,P} (40967-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
@@ -31,22 +32,22 @@ Command (m for help): Partition type
 Select (default e): 
 Selected partition 4
 First sector (61447-102399, default 61447): Last sector, +/-sectors or +/-size{K,M,G,T,P} (61447-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 5
 First sector (61454-102399, default 63487): Last sector, +/-sectors or +/-size{K,M,G,T,P} (63487-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 6
 First sector (61454-102399, default 75775): Last sector, +/-sectors or +/-size{K,M,G,T,P} (75775-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 7
 First sector (61454-102399, default 88063): Last sector, +/-sectors or +/-size{K,M,G,T,P} (88063-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Disk model: scsi_debug      
diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md
index ce9b3e7e91..e6ccea5cca 100644
--- a/tests/expected/fdisk/align-512-4K-md
+++ b/tests/expected/fdisk/align-512-4K-md
@@ -5,19 +5,20 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-Created a new <removed>.
+
+Command (m for help): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (51199-102399, default 51200): Last sector, +/-sectors or +/-size{K,M,G,T,P} (51200-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Disk model: scsi_debug      
@@ -45,19 +46,19 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-Created a new <removed>.
+Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-97791, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-97791, default 97791): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-97791, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-97791, default 97791): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 47.77 MiB, 50069504 bytes, 97792 sectors
 Units: sectors of 1 * 512 = 512 bytes
diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512
index 083641f471..782beca54d 100644
--- a/tests/expected/fdisk/align-512-512
+++ b/tests/expected/fdisk/align-512-512
@@ -5,25 +5,26 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-Created a new <removed>.
+
+Command (m for help): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +/-sectors or +/-size{K,M,G,T,P} (43008-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
@@ -31,22 +32,22 @@ Command (m for help): Partition type
 Select (default e): 
 Selected partition 4
 First sector (63488-102399, default 63488): Last sector, +/-sectors or +/-size{K,M,G,T,P} (63488-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 5
 First sector (65536-102399, default 65536): Last sector, +/-sectors or +/-size{K,M,G,T,P} (65536-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 6
 First sector (77824-102399, default 77824): Last sector, +/-sectors or +/-size{K,M,G,T,P} (77824-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 7
 First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K,M,G,T,P} (90112-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Units: sectors of 1 * 512 = 512 bytes
diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology
index 65420b6b92..2ca98930c4 100644
--- a/tests/expected/fdisk/align-512-512-topology
+++ b/tests/expected/fdisk/align-512-512-topology
@@ -5,25 +5,26 @@ Changes will remain in memory only, until you decide to write them.
 Be careful before using the write command.
 
 Device does not contain a recognized partition table.
-Created a new <removed>.
+
+Command (m for help): Created a new disklabel.
 
 Command (m for help): Partition type
    p   primary (0 primary, 0 extended, 4 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (2 primary, 0 extended, 2 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +/-sectors or +/-size{K,M,G,T,P} (43008-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Partition type
    p   primary (3 primary, 0 extended, 1 free)
@@ -31,22 +32,22 @@ Command (m for help): Partition type
 Select (default e): 
 Selected partition 4
 First sector (63488-102399, default 63488): Last sector, +/-sectors or +/-size{K,M,G,T,P} (63488-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 5
 First sector (65536-102399, default 65536): Last sector, +/-sectors or +/-size{K,M,G,T,P} (65536-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 6
 First sector (77824-102399, default 77824): Last sector, +/-sectors or +/-size{K,M,G,T,P} (77824-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): All primary partitions are in use.
 Adding logical partition 7
 First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K,M,G,T,P} (90112-102399, default 102399): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors
 Disk model: scsi_debug      
diff --git a/tests/expected/fdisk/gpt-resize b/tests/expected/fdisk/gpt-resize
index 01e220e43d..64b6c431d9 100644
--- a/tests/expected/fdisk/gpt-resize
+++ b/tests/expected/fdisk/gpt-resize
@@ -3,8 +3,8 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
 I/O size (minimum/optimal): 512 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>p1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>p1: Created a new partition <removed>.
 <removed>p2: Done.
 
 New situation:
@@ -23,7 +23,7 @@ Be careful before using the write command.
 
 
 Command (m for help): Partition number (2-128, default 2): First sector (20447-40926, default 20480): Last sector, +/-sectors or +/-size{K,M,G,T,P} (20480-40926, default 40926): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): The partition table has been altered.
 Calling ioctl() to re-read partition table.
diff --git a/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end b/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end
index 4efd2a2871..d5c5f45ed0 100644
--- a/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end
+++ b/tests/expected/fdisk/mbr-nondos-mode-first-sector-at-end
@@ -24,7 +24,7 @@ Command (m for help): Partition type
    p   primary (1 primary, 0 extended, 3 free)
    e   extended (container for logical partitions)
 Select (default p): Partition number (2-4, default 2): First sector (2048-19999, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-19999, default 19999): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): The partition table has been altered.
 Syncing disks.
diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel
index 5ada4fab1e..33bdad1675 100644
--- a/tests/expected/fdisk/sunlabel
+++ b/tests/expected/fdisk/sunlabel
@@ -60,7 +60,7 @@ Be careful before using the write command.
 
 
 Command (m for help): Partition number (2-8, default 2): First cylinder (128-325, default 128): Last cylinder or +/-cylinders or +/-size{K,M,G,T,P} (128-325, default 325): 
-Created a new <removed>.
+Created a new partition <removed>.
 
 Command (m for help): The partition table has been altered.
 Syncing disks.
diff --git a/tests/expected/libfdisk/gpt-all-defaults b/tests/expected/libfdisk/gpt-all-defaults
index ccc185cd3a..6351f25de7 100644
--- a/tests/expected/libfdisk/gpt-all-defaults
+++ b/tests/expected/libfdisk/gpt-all-defaults
@@ -7,9 +7,9 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
 <removed>3: Done.
 
 New situation:
diff --git a/tests/expected/libfdisk/gpt-all-defaults-with-typo b/tests/expected/libfdisk/gpt-all-defaults-with-typo
index ccc185cd3a..6351f25de7 100644
--- a/tests/expected/libfdisk/gpt-all-defaults-with-typo
+++ b/tests/expected/libfdisk/gpt-all-defaults-with-typo
@@ -7,9 +7,9 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
 <removed>3: Done.
 
 New situation:
diff --git a/tests/expected/libfdisk/mkpart-full-gpt b/tests/expected/libfdisk/mkpart-full-gpt
index 7740454fd3..8e78a27cfc 100644
--- a/tests/expected/libfdisk/mkpart-full-gpt
+++ b/tests/expected/libfdisk/mkpart-full-gpt
@@ -1,18 +1,18 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=10240,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=5,start=12288,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=6,start=14336,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
index 3d912ed5db..531606e864 100644
--- a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
+++ b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap
@@ -1,10 +1,10 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=5000,size=2048>
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-gpt-nopartno b/tests/expected/libfdisk/mkpart-full-gpt-nopartno
index fc9fdf2407..c038c37fee 100644
--- a/tests/expected/libfdisk/mkpart-full-gpt-nopartno
+++ b/tests/expected/libfdisk/mkpart-full-gpt-nopartno
@@ -1,18 +1,18 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=<default>,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=10240,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=12288,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=14336,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-gpt-partno-gap b/tests/expected/libfdisk/mkpart-full-gpt-partno-gap
index 3a65d37e42..a636e281e4 100644
--- a/tests/expected/libfdisk/mkpart-full-gpt-partno-gap
+++ b/tests/expected/libfdisk/mkpart-full-gpt-partno-gap
@@ -1,18 +1,18 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=6,start=10240,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=7,start=12288,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=8,start=14336,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-gpt-space-gap b/tests/expected/libfdisk/mkpart-full-gpt-space-gap
index 64b2da4ab2..5dcdb77f91 100644
--- a/tests/expected/libfdisk/mkpart-full-gpt-space-gap
+++ b/tests/expected/libfdisk/mkpart-full-gpt-space-gap
@@ -1,14 +1,14 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=12288,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=14336,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-logical b/tests/expected/libfdisk/mkpart-full-mbr-err-logical
index a08070ea3f..f8e9b7d9f9 100644
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-logical
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-logical
@@ -1,15 +1,15 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=10240,size=2048>
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=5,start=4096,size=2048>
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
index 3a1cd636cd..e8aff295f0 100644
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace
@@ -1,8 +1,8 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=4096,size=2048>
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-primary b/tests/expected/libfdisk/mkpart-full-mbr-err-primary
index 57fcc5c3f4..32007512dc 100644
--- a/tests/expected/libfdisk/mkpart-full-mbr-err-primary
+++ b/tests/expected/libfdisk/mkpart-full-mbr-err-primary
@@ -1,8 +1,8 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=6,start=6144,size=2048>
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-mbr-logical b/tests/expected/libfdisk/mkpart-full-mbr-logical
index ff2611cbb2..d3d27cb38d 100644
--- a/tests/expected/libfdisk/mkpart-full-mbr-logical
+++ b/tests/expected/libfdisk/mkpart-full-mbr-logical
@@ -1,21 +1,21 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=4,start=10240,size=2048>
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=5,start=14336,size=2048>
 Adding logical partition 6
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=6,start=18432,size=12288>
 Adding logical partition 7
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-mbr-nopartno b/tests/expected/libfdisk/mkpart-full-mbr-nopartno
index c8c449cd1b..51aa5a7f24 100644
--- a/tests/expected/libfdisk/mkpart-full-mbr-nopartno
+++ b/tests/expected/libfdisk/mkpart-full-mbr-nopartno
@@ -1,21 +1,21 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=<default>,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=10240,size=2048>
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=14336,size=2048>
 Adding logical partition 6
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=18432,size=12288>
 Adding logical partition 7
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-mbr-primary b/tests/expected/libfdisk/mkpart-full-mbr-primary
index c71ec9e1fa..cd3604ffea 100644
--- a/tests/expected/libfdisk/mkpart-full-mbr-primary
+++ b/tests/expected/libfdisk/mkpart-full-mbr-primary
@@ -1,12 +1,12 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=3,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-mbr-primary-nopartno b/tests/expected/libfdisk/mkpart-full-mbr-primary-nopartno
index 33ba9ff880..a8b5819dfa 100644
--- a/tests/expected/libfdisk/mkpart-full-mbr-primary-nopartno
+++ b/tests/expected/libfdisk/mkpart-full-mbr-primary-nopartno
@@ -1,12 +1,12 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=<default>,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=4096,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=<default>,start=8192,size=22528>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-full-mbr-space-gap b/tests/expected/libfdisk/mkpart-full-mbr-space-gap
index 881ea9ec74..1fe0061828 100644
--- a/tests/expected/libfdisk/mkpart-full-mbr-space-gap
+++ b/tests/expected/libfdisk/mkpart-full-mbr-space-gap
@@ -1,10 +1,10 @@
-Created a new <removed>.
+Created a new disklabel.
 Requested partition: <partno=0,start=2048,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=1,start=6144,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Requested partition: <partno=2,start=8192,size=2048>
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-gpt b/tests/expected/libfdisk/mkpart-gpt
index 3634695f97..fab28b1ce6 100644
--- a/tests/expected/libfdisk/mkpart-gpt
+++ b/tests/expected/libfdisk/mkpart-gpt
@@ -1,11 +1,11 @@
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
+Created a new disklabel.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-mbr b/tests/expected/libfdisk/mkpart-mbr
index 0212000e32..883efd7833 100644
--- a/tests/expected/libfdisk/mkpart-mbr
+++ b/tests/expected/libfdisk/mkpart-mbr
@@ -1,8 +1,8 @@
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
+Created a new disklabel.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-mbr-logic b/tests/expected/libfdisk/mkpart-mbr-logic
index 178eaf2f23..eddaef0f17 100644
--- a/tests/expected/libfdisk/mkpart-mbr-logic
+++ b/tests/expected/libfdisk/mkpart-mbr-logic
@@ -1,14 +1,14 @@
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
+Created a new disklabel.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Adding logical partition 6
-Created a new <removed>.
+Created a new partition <removed>.
 Adding logical partition 7
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/libfdisk/mkpart-mbr-nopartno b/tests/expected/libfdisk/mkpart-mbr-nopartno
index 178eaf2f23..eddaef0f17 100644
--- a/tests/expected/libfdisk/mkpart-mbr-nopartno
+++ b/tests/expected/libfdisk/mkpart-mbr-nopartno
@@ -1,14 +1,14 @@
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
-Created a new <removed>.
+Created a new disklabel.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
+Created a new partition <removed>.
 Adding logical partition 5
-Created a new <removed>.
+Created a new partition <removed>.
 Adding logical partition 6
-Created a new <removed>.
+Created a new partition <removed>.
 Adding logical partition 7
-Created a new <removed>.
+Created a new partition <removed>.
 Disk <removed>: 15 MiB, 15728640 bytes, 30720 sectors
 Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 512 bytes
diff --git a/tests/expected/sfdisk/dos-dump-gaps b/tests/expected/sfdisk/dos-dump-gaps
index 26a6e93f2c..ee473e6ebd 100644
--- a/tests/expected/sfdisk/dos-dump-gaps
+++ b/tests/expected/sfdisk/dos-dump-gaps
@@ -7,10 +7,10 @@ Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Ignoring partition.
-<removed>3: Created a new <removed>.
+<removed>3: Created a new partition <removed>.
 <removed>4: Ignoring partition.
 <removed>5: Done.
 
diff --git a/tests/expected/sfdisk/dos-dump-old b/tests/expected/sfdisk/dos-dump-old
index eb0cc114f1..83f5bdd630 100644
--- a/tests/expected/sfdisk/dos-dump-old
+++ b/tests/expected/sfdisk/dos-dump-old
@@ -7,8 +7,8 @@ Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Ignoring partition.
 <removed>3: Ignoring partition.
 <removed>4: Ignoring partition.
diff --git a/tests/expected/sfdisk/dos-explicit-size b/tests/expected/sfdisk/dos-explicit-size
index 70f1ba7981..20f421c410 100644
--- a/tests/expected/sfdisk/dos-explicit-size
+++ b/tests/expected/sfdisk/dos-explicit-size
@@ -7,14 +7,14 @@ Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
-<removed>6: Created a new <removed>.
-<removed>7: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
+<removed>6: Created a new partition <removed>.
+<removed>7: Created a new partition <removed>.
 <removed>8: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/dos-read-dump b/tests/expected/sfdisk/dos-read-dump
index b4f24491bb..a0b0b77ca2 100644
--- a/tests/expected/sfdisk/dos-read-dump
+++ b/tests/expected/sfdisk/dos-read-dump
@@ -8,13 +8,13 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
-<removed>6: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
+<removed>6: Created a new partition <removed>.
 <removed>7: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/dos-read-dump-case b/tests/expected/sfdisk/dos-read-dump-case
index a6fc3f2579..3486cb2027 100644
--- a/tests/expected/sfdisk/dos-read-dump-case
+++ b/tests/expected/sfdisk/dos-read-dump-case
@@ -8,8 +8,8 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/dos-simple-commas b/tests/expected/sfdisk/dos-simple-commas
index ea69e0dc94..b44be4157d 100644
--- a/tests/expected/sfdisk/dos-simple-commas
+++ b/tests/expected/sfdisk/dos-simple-commas
@@ -6,13 +6,13 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
-<removed>6: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
+<removed>6: Created a new partition <removed>.
 <removed>7: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/dos-simple-space b/tests/expected/sfdisk/dos-simple-space
index 858ddc9eae..1e22e9a09e 100644
--- a/tests/expected/sfdisk/dos-simple-space
+++ b/tests/expected/sfdisk/dos-simple-space
@@ -6,10 +6,10 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
 <removed>4: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/dump-current b/tests/expected/sfdisk/dump-current
index 9a14bf959c..86b3f40a74 100644
--- a/tests/expected/sfdisk/dump-current
+++ b/tests/expected/sfdisk/dump-current
@@ -13,11 +13,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/dump-v2.32 b/tests/expected/sfdisk/dump-v2.32
index bd19fc4205..2c62295c6c 100644
--- a/tests/expected/sfdisk/dump-v2.32
+++ b/tests/expected/sfdisk/dump-v2.32
@@ -12,11 +12,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/dump-v2.35 b/tests/expected/sfdisk/dump-v2.35
index 9a14bf959c..86b3f40a74 100644
--- a/tests/expected/sfdisk/dump-v2.35
+++ b/tests/expected/sfdisk/dump-v2.35
@@ -13,11 +13,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/gpt-all-defaults b/tests/expected/sfdisk/gpt-all-defaults
index b654dd7bcb..55eb256a9e 100644
--- a/tests/expected/sfdisk/gpt-all-defaults
+++ b/tests/expected/sfdisk/gpt-all-defaults
@@ -8,12 +8,12 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
 <removed>6: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/gpt-read-dump b/tests/expected/sfdisk/gpt-read-dump
index 60d9922229..a35f2d4ccf 100644
--- a/tests/expected/sfdisk/gpt-read-dump
+++ b/tests/expected/sfdisk/gpt-read-dump
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/gpt-reorder b/tests/expected/sfdisk/gpt-reorder
index ff0ef07437..d4c430690e 100644
--- a/tests/expected/sfdisk/gpt-reorder
+++ b/tests/expected/sfdisk/gpt-reorder
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/resize-dos-unsorted b/tests/expected/sfdisk/resize-dos-unsorted
index 49133bb122..a16c3261e4 100644
--- a/tests/expected/sfdisk/resize-dos-unsorted
+++ b/tests/expected/sfdisk/resize-dos-unsorted
@@ -8,13 +8,13 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
-<removed>5: Created a new <removed>.
-<removed>6: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
+<removed>5: Created a new partition <removed>.
+<removed>6: Created a new partition <removed>.
 <removed>7: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/script-quotes b/tests/expected/sfdisk/script-quotes
index e38b8395ce..5ae4d4fc50 100644
--- a/tests/expected/sfdisk/script-quotes
+++ b/tests/expected/sfdisk/script-quotes
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/script-separator b/tests/expected/sfdisk/script-separator
index db2f2c423b..0ac5453472 100644
--- a/tests/expected/sfdisk/script-separator
+++ b/tests/expected/sfdisk/script-separator
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/script-type-and-id b/tests/expected/sfdisk/script-type-and-id
index c834f2290a..ee6dc555ed 100644
--- a/tests/expected/sfdisk/script-type-and-id
+++ b/tests/expected/sfdisk/script-type-and-id
@@ -9,11 +9,11 @@ I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 >>> Script header accepted.
 >>> Script header accepted.
 >>> Script header accepted.
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
-<removed>2: Created a new <removed>.
-<removed>3: Created a new <removed>.
-<removed>4: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
+<removed>2: Created a new partition <removed>.
+<removed>3: Created a new partition <removed>.
+<removed>4: Created a new partition <removed>.
 <removed>5: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/wipe-fs-to-dos b/tests/expected/sfdisk/wipe-fs-to-dos
index 317bbfb450..8f97e25e55 100644
--- a/tests/expected/sfdisk/wipe-fs-to-dos
+++ b/tests/expected/sfdisk/wipe-fs-to-dos
@@ -9,9 +9,9 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
+>>> Created a new disklabel.
 
-<removed>1: Created a new <removed>.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos b/tests/expected/sfdisk/wipe-gpt-to-dos
index 1c90e956cf..de7cd6298d 100644
--- a/tests/expected/sfdisk/wipe-gpt-to-dos
+++ b/tests/expected/sfdisk/wipe-gpt-to-dos
@@ -6,8 +6,8 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
@@ -33,8 +33,8 @@ Old situation:
 Device             Start    End Sectors Size Type
 <removed>1   2048 102366  100319  49M Linux filesystem
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos-auto b/tests/expected/sfdisk/wipe-gpt-to-dos-auto
index ca060a8a61..d6c075fff7 100644
--- a/tests/expected/sfdisk/wipe-gpt-to-dos-auto
+++ b/tests/expected/sfdisk/wipe-gpt-to-dos-auto
@@ -13,8 +13,8 @@ Old situation:
 Device     Boot Start    End Sectors Size Id Type
 <removed>1        2048 102399  100352  49M 83 Linux
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
@@ -40,8 +40,8 @@ Old situation:
 Device             Start    End Sectors Size Type
 <removed>1   2048 102366  100319  49M Linux filesystem
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
diff --git a/tests/expected/sfdisk/wipe-partition b/tests/expected/sfdisk/wipe-partition
index 9d608ae74f..dc5e5fceab 100644
--- a/tests/expected/sfdisk/wipe-partition
+++ b/tests/expected/sfdisk/wipe-partition
@@ -6,8 +6,8 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 <removed>2: Done.
 
 New situation:
@@ -32,8 +32,8 @@ Units: sectors of 1 * 512 = 512 bytes
 Sector size (logical/physical): 512 bytes / 4096 bytes
 I/O size (minimum/optimal): 4096 bytes / <removed> bytes
 
->>> Created a new <removed>.
-<removed>1: Created a new <removed>.
+>>> Created a new disklabel.
+<removed>1: Created a new partition <removed>.
 The signature will be removed by a write command.
 <removed>2: Done.
 
diff --git a/tests/functions.sh b/tests/functions.sh
index 0af8b96b77..60bef734ef 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -770,7 +770,8 @@ function ts_fdisk_clean {
 
 	sed -i \
 		-e 's/Disk identifier:.*/Disk identifier: <removed>/' \
-		-e 's/Created a new.*/Created a new <removed>./' \
+		-e 's/Created a new partition.*/Created a new partition <removed>./' \
+		-e 's/Created a new .* disklabel .*/Created a new disklabel./' \
 		-e 's/^Device[[:blank:]]*Start/Device             Start/' \
 		-e 's/^Device[[:blank:]]*Boot/Device     Boot/' \
 		-e 's/Welcome to fdisk.*/Welcome to fdisk <removed>./' \
diff --git a/tests/ts/blkid/md-raid0-whole b/tests/ts/blkid/md-raid0-whole
index d2f780bdb9..c78f774dd6 100755
--- a/tests/ts/blkid/md-raid0-whole
+++ b/tests/ts/blkid/md-raid0-whole
@@ -51,7 +51,7 @@ mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=0 \
 	    --raid-devices=2 ${DEVICE1} ${DEVICE2} >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 # create dos partition table
-$TS_CMD_FDISK ${MD_DEVICE} &>/dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${MD_DEVICE} &>/dev/null <<EOF
 o
 w
 q
diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part
index a72fde7d18..0f231fefb7 100755
--- a/tests/ts/blkid/md-raid1-part
+++ b/tests/ts/blkid/md-raid1-part
@@ -34,7 +34,8 @@ TS_KNOWN_FAIL="yes"	# due to recent changes in mdadm
 ts_scsi_debug_init dev_size_mb=51 sector_size=512
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1
diff --git a/tests/ts/blkid/md-raid1-whole b/tests/ts/blkid/md-raid1-whole
index 97105e8ca1..771aab7949 100755
--- a/tests/ts/blkid/md-raid1-whole
+++ b/tests/ts/blkid/md-raid1-whole
@@ -54,7 +54,7 @@ mdadm -q --create ${MD_DEVICE} --metadata=0.90 --chunk=64 --level=1 \
 udevadm settle
 
 # create dos partition table
-$TS_CMD_FDISK ${MD_DEVICE} &>/dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${MD_DEVICE} &>/dev/null <<EOF
 o
 w
 q
diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
index 00d24c11d3..c12d06997f 100755
--- a/tests/ts/eject/umount
+++ b/tests/ts/eject/umount
@@ -34,7 +34,7 @@ function init_partitions {
 	local dev=$1
 
 	ts_log "Create partitions"
-	$TS_CMD_FDISK $dev >> /dev/null 2>&1 <<EOF
+	$TS_CMD_FDISK --noauto-pt $dev >> /dev/null 2>&1 <<EOF
 o
 n
 p
diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K
index b6e695f985..88e99cbd88 100755
--- a/tests/ts/fdisk/align-512-4K
+++ b/tests/ts/fdisk/align-512-4K
@@ -35,7 +35,8 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63
index e6a4af76be..325a5d47bc 100755
--- a/tests/ts/fdisk/align-512-4K-63
+++ b/tests/ts/fdisk/align-512-4K-63
@@ -35,7 +35,8 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3 lowest_aligned=7
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md
index 2882ca4027..4604976807 100755
--- a/tests/ts/fdisk/align-512-4K-md
+++ b/tests/ts/fdisk/align-512-4K-md
@@ -38,7 +38,8 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512 physblk_exp=3
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-512 b/tests/ts/fdisk/align-512-512
index 94a4c1fc8d..cda13211a7 100755
--- a/tests/ts/fdisk/align-512-512
+++ b/tests/ts/fdisk/align-512-512
@@ -34,7 +34,8 @@ ts_device_init 50
 DEVICE=$TS_LODEV
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1
diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology
index 48044684b0..3ccb1a9007 100755
--- a/tests/ts/fdisk/align-512-512-topology
+++ b/tests/ts/fdisk/align-512-512-topology
@@ -35,7 +35,8 @@ ts_scsi_debug_init dev_size_mb=50 sector_size=512
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} >> $TS_OUTPUT 2>> $TS_ERRLOG <<EOF
+o
 n
 p
 1
diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd
index 0444042a84..27cd87fe71 100755
--- a/tests/ts/fdisk/bsd
+++ b/tests/ts/fdisk/bsd
@@ -93,7 +93,7 @@ $TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_SETID}${FDISK_CMD_WRITE_CLOSE}" \
-	 | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	 | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
 $TS_CMD_HEXDUMP -C ${TEST_IMAGE_NAME} >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 print_layout
diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt
index ee8d83f1bc..83fe34248e 100755
--- a/tests/ts/fdisk/gpt
+++ b/tests/ts/fdisk/gpt
@@ -45,7 +45,7 @@ TEST_IMAGE_NAME=$(ts_image_init 10)
 
 ts_log "Create new GPT partition table"
 echo -e "${FDISK_CMD_CREATE_GPTLABEL}${FDISK_CMD_WRITE_CLOSE}" \
-	 | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	 | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
 
 print_layout
 
diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode
index 13be20b7d9..4e62cb211d 100755
--- a/tests/ts/fdisk/mbr-dos-mode
+++ b/tests/ts/fdisk/mbr-dos-mode
@@ -55,7 +55,7 @@ ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
-	 | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
+	 | $TS_CMD_FDISK --noauto-pt ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 print_layout
diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode
index 5f469623e6..a163d77645 100755
--- a/tests/ts/fdisk/mbr-nondos-mode
+++ b/tests/ts/fdisk/mbr-nondos-mode
@@ -65,8 +65,8 @@ ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 # need to run init twice, to change system ID after new label, otherwise system
 # ID will be random and will screw up md5's
 ts_log "Create new DOS partition table"
-echo -e "${FDISK_CMD_INIT}${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
-	 | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_INIT}${FDISK_CMD_WRITE_CLOSE}" \
+	 | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 print_layout
 ts_finalize_subtest
diff --git a/tests/ts/fdisk/mbr-sort b/tests/ts/fdisk/mbr-sort
index 2cdb11557a..8ae51bf67e 100755
--- a/tests/ts/fdisk/mbr-sort
+++ b/tests/ts/fdisk/mbr-sort
@@ -51,7 +51,7 @@ TEST_IMAGE_NAME=$(ts_image_init 20)	# 20 MiB
 
 ts_log "Create new DOS partition table"
 echo -e "${FDISK_CMD_CREATE_DOSLABEL}${FDISK_CMD_WRITE_CLOSE}" \
-	 | $TS_CMD_FDISK ${TEST_IMAGE_NAME} &> /dev/null
+	 | $TS_CMD_FDISK --noauto-pt ${TEST_IMAGE_NAME} &> /dev/null
 
 print_layout
 
diff --git a/tests/ts/fdisk/sunlabel b/tests/ts/fdisk/sunlabel
index edf7f2eac3..7f72743f40 100755
--- a/tests/ts/fdisk/sunlabel
+++ b/tests/ts/fdisk/sunlabel
@@ -43,7 +43,7 @@ ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 ts_log "Create new SUN partition table"
 echo -e "${FDISK_CMD_INIT}${FDISK_CMD_DELETEALL}${FDISK_CMD_WRITE_CLOSE}" \
-	 | $TS_CMD_FDISK ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
+	 | $TS_CMD_FDISK --noauto-pt ${FDISK_OPTIONS} ${TEST_IMAGE_NAME} &> /dev/null
 ts_image_md5sum >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 $TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT
diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index 4ace9a0ad1..e355b6e9d8 100755
--- a/tests/ts/fsck/ismounted
+++ b/tests/ts/fsck/ismounted
@@ -20,7 +20,6 @@ TS_DESC="is mounted"
 . $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_MOUNT"
 ts_check_test_command "$TS_CMD_UMOUNT"
 ts_check_test_command "$TS_HELPER_ISMOUNTED"
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 2277ca16d4..babeec98f0 100755
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -39,7 +39,7 @@ if [ "$has_mtab" == "yes" ]; then
 fi
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p
diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 941a7fe421..edbf75f076 100755
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -48,7 +48,7 @@ if [ "$has_mtab" == "yes" ]; then
 fi
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p
diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index 8702e24c70..47a6769bef 100755
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -30,7 +30,7 @@ ts_scsi_debug_init dev_size_mb=257
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p
diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index 9950617b5f..0baff118c5 100755
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -35,7 +35,7 @@ ts_scsi_debug_init dev_size_mb=257
 DEVNAME=$(basename $TS_DEVICE)
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p
diff --git a/tests/ts/mount/fstab-all b/tests/ts/mount/fstab-all
index e8f0c9ea46..acc64e462e 100755
--- a/tests/ts/mount/fstab-all
+++ b/tests/ts/mount/fstab-all
@@ -21,7 +21,7 @@ ts_check_prog "mkfs.ext4"
 ts_scsi_debug_init dev_size_mb=50
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p
diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index 1be8c4be4b..37a163d879 100755
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -27,7 +27,7 @@ fi
 ts_scsi_debug_init dev_size_mb=50
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p
diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index 90ca0272a7..700c58c12e 100755
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -23,7 +23,7 @@ ts_log "Init device"
 ts_scsi_debug_init dev_size_mb=50
 
 ts_log "Create partitions"
-$TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF
+$TS_CMD_FDISK --noauto-pt ${TS_DEVICE} &> /dev/null <<EOF
 o
 n
 p
diff --git a/tests/ts/sfdisk/dump b/tests/ts/sfdisk/dump
index 917e4aec42..09a126747a 100755
--- a/tests/ts/sfdisk/dump
+++ b/tests/ts/sfdisk/dump
@@ -22,7 +22,6 @@ TS_DESC="script"
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_SFDISK"
-ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_WIPEFS"
 
 ts_skip_nonroot
diff --git a/tests/ts/sfdisk/script b/tests/ts/sfdisk/script
index 43655958f8..501fce14fe 100755
--- a/tests/ts/sfdisk/script
+++ b/tests/ts/sfdisk/script
@@ -22,7 +22,6 @@ TS_DESC="script"
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_SFDISK"
-ts_check_test_command "$TS_CMD_FDISK"
 ts_check_test_command "$TS_CMD_WIPEFS"
 
 ts_skip_nonroot