diff --git a/0099-tests-Add-ntfs-vfat-hfsplus-to-t1700-probe-test.patch b/0099-tests-Add-ntfs-vfat-hfsplus-to-t1700-probe-test.patch
index 1809650..83e6de5 100644
--- a/0099-tests-Add-ntfs-vfat-hfsplus-to-t1700-probe-test.patch
+++ b/0099-tests-Add-ntfs-vfat-hfsplus-to-t1700-probe-test.patch
@@ -1,7 +1,7 @@
-From 01d4a9431ddecb1fb4ff276aa33e6e4ac3418f1d Mon Sep 17 00:00:00 2001
+From f988537d99ae18e9307f99821de8f71953ad8d4f Mon Sep 17 00:00:00 2001
 From: "Brian C. Lane" <bcl@redhat.com>
 Date: Thu, 17 Apr 2014 12:14:48 -0700
-Subject: [PATCH 99/99] tests: Add ntfs vfat hfsplus to t1700 probe test
+Subject: [PATCH] tests: Add ntfs vfat hfsplus to t1700 probe test
 
 Add some new filesystems to test. Adjust how mkfs.* tests, since some of
 them don't support -V, and add fsname so that the printed filesystem
@@ -9,14 +9,14 @@ name doesn't have to match the type.
 
 * tests/t1700-probe-fs.sh: Add new filesystems to test
 ---
- tests/t1700-probe-fs.sh | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
+ tests/t1700-probe-fs.sh | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
 
 diff --git a/tests/t1700-probe-fs.sh b/tests/t1700-probe-fs.sh
-index bf6ad9c..d53cc7e 100755
+index bf6ad9c..695f9ef 100755
 --- a/tests/t1700-probe-fs.sh
 +++ b/tests/t1700-probe-fs.sh
-@@ -23,14 +23,20 @@ dev=loop-file
+@@ -23,28 +23,37 @@ dev=loop-file
  ss=$sector_size_
  n_sectors=$((257*1024))
  
@@ -34,14 +34,16 @@ index bf6ad9c..d53cc7e 100755
 +      ext*) force=-F;;
        xfs) force=-f;;
 -      *) force=;; esac
++      nilfs2) force=-f;;
 +      ntfs) force=-F;;
 +      vfat) fsname=fat16;;
 +      hfsplus) fsname=hfs+;;
 +  esac
  
    # create an $type file system
++  [ -e $dev ] && rm -f $dev
    dd if=/dev/null of=$dev bs=$ss seek=$n_sectors >/dev/null || fail=1
-@@ -38,7 +44,7 @@ for type in ext2 ext3 ext4 btrfs xfs nilfs2; do
+   mkfs.$type $force $dev || { warn_ $ME: mkfs.$type failed; fail=1; continue; }
  
    # probe the $type file system
    parted -m -s $dev u s print >out 2>&1 || fail=1
@@ -50,6 +52,13 @@ index bf6ad9c..d53cc7e 100755
  
  done
  
+ # Some features should indicate ext4 by themselves.
+ for feature in uninit_bg flex_bg; do
+   # create an ext3 file system
++  [ -e $dev ] && rm -f $dev
+   dd if=/dev/null of=$dev bs=1024 seek=4096 >/dev/null || fail=1
+   mkfs.ext3 -F $dev >/dev/null || skip_ "mkfs.ext3 failed"
+ 
 -- 
 1.9.0
 
diff --git a/parted.spec b/parted.spec
index 6ff4e55..5dfdf2c 100644
--- a/parted.spec
+++ b/parted.spec
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 3.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -261,6 +261,9 @@ fi
 
 
 %changelog
+* Fri Apr 18 2014 Brian C. Lane <bcl@redhat.com> 3.1-21
+- Fix t1700 probe patch -- remove loop before making new fs
+
 * Thu Apr 17 2014 Brian C. Lane <bcl@redhat.com> 3.1-20
 - Use force for xfs in t1700 and a larger file
 - Make t4100 xfs filesystem larger and sparse