diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh
index c72c67f10..519da42f3 100755
--- a/test/iscsi_tgt/filesystem/filesystem.sh
+++ b/test/iscsi_tgt/filesystem/filesystem.sh
@@ -69,8 +69,7 @@ mkdir -p /mnt/device
 dev=$(iscsiadm -m session -P 3 | grep "Attached scsi disk" | awk '{print $4}')
 
 waitforfile /dev/$dev
-parted -s /dev/$dev mklabel msdos
-parted -s /dev/$dev mkpart primary '0%' '100%'
+parted -s /dev/$dev mklabel gpt mkpart SPDK_TEST '0%' '100%'
 sleep 1
 
 function filesystem_test() {
diff --git a/test/nvmf/target/filesystem.sh b/test/nvmf/target/filesystem.sh
index 672eb88e2..026b6e9d4 100755
--- a/test/nvmf/target/filesystem.sh
+++ b/test/nvmf/target/filesystem.sh
@@ -58,8 +58,7 @@ function nvmf_filesystem_part() {
 	nvme_name=$(lsblk -l -o NAME,SERIAL | grep -oP "([\w]*)(?=\s+${NVMF_SERIAL})")
 
 	mkdir -p /mnt/device
-
-	parted -s /dev/${nvme_name} mklabel msdos mkpart primary '0%' '100%'
+	parted -s /dev/${nvme_name} mklabel gpt mkpart SPDK_TEST '0%' '100%'
 	partprobe
 	sleep 1