diff --git a/patches/xfstests-0001-generic-531-Disable-on-NFS.patch b/patches/xfstests-0001-generic-531-Disable-on-NFS.patch
new file mode 100644
index 0000000..e9adcc7
--- /dev/null
+++ b/patches/xfstests-0001-generic-531-Disable-on-NFS.patch
@@ -0,0 +1,60 @@
+From 9a035433e54362015a8e2f2acff85e7f658b0400 Mon Sep 17 00:00:00 2001
+From: Anna Schumaker <Anna.Schumaker@Netapp.com>
+Date: Mon, 12 Jul 2021 11:57:51 -0400
+Subject: [PATCH 1/3] generic/531: Disable on NFS
+
+Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+---
+ common/rc         | 15 +++++++++++++++
+ tests/generic/531 |  2 ++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/common/rc b/common/rc
+index a419b3ba53f6..91f0fc7b555c 100644
+--- a/common/rc
++++ b/common/rc
+@@ -1535,6 +1535,21 @@ _supported_fs()
+     _notrun "not suitable for this filesystem type: $FSTYP"
+ }
+ 
++# tests whether $FSTYP is one of the unsupported filesystems for a test
++#
++_unsupported_fs()
++{
++    local f
++
++    for f
++    do
++        if [ "$f" = "$FSTYP" -o "$f" = "generic" ]
++        then
++            _notrun "not suitable for this filesystem type: $FSTYP"
++        fi
++    done
++}
++
+ # check if a FS on a device is mounted
+ # if so, verify that it is mounted on mount point
+ # if fstype is given as argument, verify that it is also
+diff --git a/tests/generic/531 b/tests/generic/531
+index 5e84ca977b44..3a696a526bde 100755
+--- a/tests/generic/531
++++ b/tests/generic/531
+@@ -19,6 +19,7 @@ testfile=$TEST_DIR/$seq.txt
+ 
+ # real QA test starts here
+ _supported_fs generic
++_unsupported_fs nfs
+ _require_scratch
+ _require_test_program "t_open_tmpfiles"
+ 
+@@ -35,6 +36,7 @@ max_allowable_files=$(( $(cat /proc/sys/fs/file-max) / $nr_cpus / 2 ))
+ test $max_allowable_files -gt 0 && test $max_files -gt $max_allowable_files && \
+ 	max_files=$max_allowable_files
+ ulimit -n $max_files
++nr_cpus=1
+ 
+ # Open a lot of unlinked files
+ echo create >> $seqres.full
+-- 
+2.34.1
+
diff --git a/patches/xfstests-0002-check-Fixes-for-running-multiple-instances-in-parall.patch b/patches/xfstests-0002-check-Fixes-for-running-multiple-instances-in-parall.patch
new file mode 100644
index 0000000..15c4938
--- /dev/null
+++ b/patches/xfstests-0002-check-Fixes-for-running-multiple-instances-in-parall.patch
@@ -0,0 +1,68 @@
+From 3e8693ee7b465a7e0994234c4eedfc566fa801d6 Mon Sep 17 00:00:00 2001
+From: Anna Schumaker <Anna.Schumaker@Netapp.com>
+Date: Thu, 27 Jan 2022 09:48:09 -0500
+Subject: [PATCH 2/3] check: Fixes for running multiple instances in parallel
+
+Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+---
+ check | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/check b/check
+index a08631213cbb..de4576bdc839 100755
+--- a/check
++++ b/check
+@@ -34,7 +34,7 @@ istop=false
+ _err_msg=""
+ 
+ # start the initialisation work now
+-iam=check
++iam=check-$$
+ 
+ export MSGVERB="text:action"
+ export QA_CHECK_FS=${QA_CHECK_FS:=true}
+@@ -360,6 +360,7 @@ if ! . ./common/rc; then
+ 	echo "check: failed to source common/rc"
+ 	exit 1
+ fi
++export PLATFORM=$(_full_platform_details)
+ 
+ if [ -n "$subdir_xfile" ]; then
+ 	for d in $SRC_GROUPS $FSTYP; do
+@@ -435,6 +436,7 @@ _wrapup()
+ 	if $showme; then
+ 		if $needwrap; then
+ 			if $do_report; then
++				export PLATFORM="`_full_platform_details`"
+ 				_make_section_report
+ 			fi
+ 			needwrap=false
+@@ -504,7 +506,7 @@ _wrapup()
+ 
+ 	sum_bad=`expr $sum_bad + $n_bad`
+ 	_wipe_counters
+-	rm -f /tmp/*.rawout /tmp/*.out /tmp/*.err /tmp/*.time
++	rm -f $tmp.rawout $tmp.out $tmp.err $tmp.time
+ 	if ! $OPTIONS_HAVE_SECTIONS; then
+ 		rm -f $tmp.*
+ 	fi
+@@ -580,6 +582,7 @@ _adjust_oom_score -500
+ _run_seq() {
+ 	local cmd=(bash -c "test -w ${OOM_SCORE_ADJ} && echo 250 > ${OOM_SCORE_ADJ}; exec ./$seq")
+ 
++	(flock -x 9 || exit 1
+ 	if [ -n "${HAVE_SYSTEMD_SCOPES}" ]; then
+ 		local unit="$(systemd-escape "fs$seq").scope"
+ 		systemctl reset-failed "${unit}" &> /dev/null
+@@ -589,7 +592,7 @@ _run_seq() {
+ 		return "${res}"
+ 	else
+ 		"${cmd[@]}"
+-	fi
++	fi) 9>/tmp/$(systemd-escape fs$seq).lock
+ }
+ 
+ _detect_kmemleak
+-- 
+2.34.1
+
diff --git a/patches/xfstests-0003-Create-an-nfsquick-group-for-testing.patch b/patches/xfstests-0003-Create-an-nfsquick-group-for-testing.patch
new file mode 100644
index 0000000..59f8443
--- /dev/null
+++ b/patches/xfstests-0003-Create-an-nfsquick-group-for-testing.patch
@@ -0,0 +1,2787 @@
+From 11f82f3764cc74e6e4bc3a0c8b227b2bda6fac89 Mon Sep 17 00:00:00 2001
+From: Anna Schumaker <Anna.Schumaker@Netapp.com>
+Date: Thu, 14 Oct 2021 16:46:11 -0400
+Subject: [PATCH 3/3] Create an 'nfsquick' group for testing
+
+Running xfstests on the NFS Virtual-Bakeathon VPN network often takes
+12+ hours to complete. Let's create a new group cutting out the longer
+running tests so everything finishes in a reasonable time.
+
+Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+---
+ doc/group-names.txt | 1 +
+ tests/generic/002   | 2 +-
+ tests/generic/005   | 2 +-
+ tests/generic/020   | 2 +-
+ tests/generic/023   | 2 +-
+ tests/generic/028   | 2 +-
+ tests/generic/029   | 2 +-
+ tests/generic/030   | 2 +-
+ tests/generic/035   | 2 +-
+ tests/generic/037   | 2 +-
+ tests/generic/053   | 2 +-
+ tests/generic/069   | 2 +-
+ tests/generic/080   | 2 +-
+ tests/generic/084   | 2 +-
+ tests/generic/086   | 2 +-
+ tests/generic/087   | 2 +-
+ tests/generic/088   | 2 +-
+ tests/generic/098   | 2 +-
+ tests/generic/099   | 2 +-
+ tests/generic/103   | 2 +-
+ tests/generic/105   | 2 +-
+ tests/generic/112   | 2 +-
+ tests/generic/113   | 2 +-
+ tests/generic/116   | 2 +-
+ tests/generic/117   | 2 +-
+ tests/generic/118   | 2 +-
+ tests/generic/119   | 2 +-
+ tests/generic/123   | 2 +-
+ tests/generic/124   | 2 +-
+ tests/generic/126   | 2 +-
+ tests/generic/128   | 2 +-
+ tests/generic/130   | 2 +-
+ tests/generic/131   | 2 +-
+ tests/generic/134   | 2 +-
+ tests/generic/135   | 2 +-
+ tests/generic/138   | 2 +-
+ tests/generic/139   | 2 +-
+ tests/generic/140   | 2 +-
+ tests/generic/141   | 2 +-
+ tests/generic/144   | 2 +-
+ tests/generic/146   | 2 +-
+ tests/generic/148   | 2 +-
+ tests/generic/169   | 2 +-
+ tests/generic/178   | 2 +-
+ tests/generic/179   | 2 +-
+ tests/generic/181   | 2 +-
+ tests/generic/183   | 2 +-
+ tests/generic/184   | 2 +-
+ tests/generic/185   | 2 +-
+ tests/generic/188   | 2 +-
+ tests/generic/189   | 2 +-
+ tests/generic/190   | 2 +-
+ tests/generic/191   | 2 +-
+ tests/generic/193   | 2 +-
+ tests/generic/194   | 2 +-
+ tests/generic/195   | 2 +-
+ tests/generic/196   | 2 +-
+ tests/generic/197   | 2 +-
+ tests/generic/198   | 2 +-
+ tests/generic/199   | 2 +-
+ tests/generic/200   | 2 +-
+ tests/generic/201   | 2 +-
+ tests/generic/202   | 2 +-
+ tests/generic/203   | 2 +-
+ tests/generic/207   | 2 +-
+ tests/generic/210   | 2 +-
+ tests/generic/211   | 2 +-
+ tests/generic/212   | 2 +-
+ tests/generic/213   | 2 +-
+ tests/generic/214   | 2 +-
+ tests/generic/215   | 2 +-
+ tests/generic/221   | 2 +-
+ tests/generic/228   | 2 +-
+ tests/generic/236   | 2 +-
+ tests/generic/237   | 2 +-
+ tests/generic/240   | 2 +-
+ tests/generic/245   | 2 +-
+ tests/generic/246   | 2 +-
+ tests/generic/248   | 2 +-
+ tests/generic/249   | 2 +-
+ tests/generic/253   | 2 +-
+ tests/generic/254   | 2 +-
+ tests/generic/257   | 2 +-
+ tests/generic/258   | 2 +-
+ tests/generic/284   | 2 +-
+ tests/generic/287   | 2 +-
+ tests/generic/289   | 2 +-
+ tests/generic/290   | 2 +-
+ tests/generic/291   | 2 +-
+ tests/generic/292   | 2 +-
+ tests/generic/293   | 2 +-
+ tests/generic/294   | 2 +-
+ tests/generic/295   | 2 +-
+ tests/generic/296   | 2 +-
+ tests/generic/303   | 2 +-
+ tests/generic/306   | 2 +-
+ tests/generic/307   | 2 +-
+ tests/generic/308   | 2 +-
+ tests/generic/309   | 2 +-
+ tests/generic/313   | 2 +-
+ tests/generic/314   | 2 +-
+ tests/generic/317   | 2 +-
+ tests/generic/318   | 2 +-
+ tests/generic/319   | 2 +-
+ tests/generic/330   | 2 +-
+ tests/generic/332   | 2 +-
+ tests/generic/337   | 2 +-
+ tests/generic/346   | 2 +-
+ tests/generic/355   | 2 +-
+ tests/generic/356   | 2 +-
+ tests/generic/357   | 2 +-
+ tests/generic/358   | 2 +-
+ tests/generic/359   | 2 +-
+ tests/generic/360   | 2 +-
+ tests/generic/373   | 2 +-
+ tests/generic/375   | 2 +-
+ tests/generic/377   | 2 +-
+ tests/generic/378   | 2 +-
+ tests/generic/391   | 2 +-
+ tests/generic/393   | 2 +-
+ tests/generic/394   | 2 +-
+ tests/generic/401   | 2 +-
+ tests/generic/406   | 2 +-
+ tests/generic/407   | 2 +-
+ tests/generic/412   | 2 +-
+ tests/generic/420   | 2 +-
+ tests/generic/423   | 2 +-
+ tests/generic/426   | 2 +-
+ tests/generic/428   | 2 +-
+ tests/generic/430   | 2 +-
+ tests/generic/431   | 2 +-
+ tests/generic/432   | 2 +-
+ tests/generic/433   | 2 +-
+ tests/generic/434   | 2 +-
+ tests/generic/436   | 2 +-
+ tests/generic/437   | 2 +-
+ tests/generic/439   | 2 +-
+ tests/generic/443   | 2 +-
+ tests/generic/444   | 2 +-
+ tests/generic/445   | 2 +-
+ tests/generic/446   | 2 +-
+ tests/generic/448   | 2 +-
+ tests/generic/450   | 2 +-
+ tests/generic/451   | 2 +-
+ tests/generic/452   | 2 +-
+ tests/generic/460   | 2 +-
+ tests/generic/463   | 2 +-
+ tests/generic/465   | 2 +-
+ tests/generic/467   | 2 +-
+ tests/generic/472   | 2 +-
+ tests/generic/477   | 2 +-
+ tests/generic/478   | 2 +-
+ tests/generic/486   | 2 +-
+ tests/generic/490   | 2 +-
+ tests/generic/494   | 2 +-
+ tests/generic/495   | 2 +-
+ tests/generic/496   | 2 +-
+ tests/generic/504   | 2 +-
+ tests/generic/513   | 2 +-
+ tests/generic/514   | 2 +-
+ tests/generic/518   | 2 +-
+ tests/generic/523   | 2 +-
+ tests/generic/524   | 2 +-
+ tests/generic/525   | 2 +-
+ tests/generic/529   | 2 +-
+ tests/generic/532   | 2 +-
+ tests/generic/533   | 2 +-
+ tests/generic/538   | 2 +-
+ tests/generic/539   | 2 +-
+ tests/generic/540   | 2 +-
+ tests/generic/541   | 2 +-
+ tests/generic/542   | 2 +-
+ tests/generic/543   | 2 +-
+ tests/generic/544   | 2 +-
+ tests/generic/554   | 2 +-
+ tests/generic/565   | 2 +-
+ tests/generic/567   | 2 +-
+ tests/generic/568   | 2 +-
+ tests/generic/569   | 2 +-
+ tests/generic/571   | 2 +-
+ tests/generic/578   | 2 +-
+ tests/generic/586   | 2 +-
+ tests/generic/591   | 2 +-
+ tests/generic/597   | 2 +-
+ tests/generic/598   | 2 +-
+ tests/generic/604   | 2 +-
+ tests/generic/609   | 2 +-
+ tests/generic/611   | 2 +-
+ tests/generic/612   | 2 +-
+ tests/generic/614   | 2 +-
+ tests/generic/618   | 2 +-
+ tests/generic/632   | 2 +-
+ tests/generic/634   | 2 +-
+ tests/generic/636   | 2 +-
+ tests/generic/637   | 2 +-
+ tests/generic/638   | 2 +-
+ tests/generic/639   | 2 +-
+ tests/generic/647   | 2 +-
+ 198 files changed, 198 insertions(+), 197 deletions(-)
+
+diff --git a/doc/group-names.txt b/doc/group-names.txt
+index e8e3477e9b1e..f628baaa13e7 100644
+--- a/doc/group-names.txt
++++ b/doc/group-names.txt
+@@ -74,6 +74,7 @@ mkfs			filesystem formatting tools
+ mount			mount option and functionality checks
+ nested			nested overlayfs instances
+ nfs4_acl		NFSv4 access control lists
++nfsquick		Tests that should run in just a few minutes on the NFS Bakeathon network
+ nonsamefs		overlayfs layers on different filesystems
+ online_repair		online repair functionality tests
+ other			dumping ground, do not add more tests to this group
+diff --git a/tests/generic/002 b/tests/generic/002
+index 3974ef0e2e0f..0e9f1011af33 100755
+--- a/tests/generic/002
++++ b/tests/generic/002
+@@ -7,7 +7,7 @@
+ # simple inode link count test for a regular file
+ #
+ . ./common/preamble
+-_begin_fstest metadata udf auto quick
++_begin_fstest metadata udf auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/005 b/tests/generic/005
+index e497b33c6079..dbaf0c8651b4 100755
+--- a/tests/generic/005
++++ b/tests/generic/005
+@@ -16,7 +16,7 @@
+ # 
+ 
+ . ./common/preamble
+-_begin_fstest dir udf auto quick
++_begin_fstest dir udf auto quick nfsquick
+ 
+ status=0	# success is the default!
+ 
+diff --git a/tests/generic/020 b/tests/generic/020
+index 29ef853c87f3..0bc07245cfa2 100755
+--- a/tests/generic/020
++++ b/tests/generic/020
+@@ -7,7 +7,7 @@
+ # extended attributes
+ #
+ . ./common/preamble
+-_begin_fstest metadata attr udf auto quick
++_begin_fstest metadata attr udf auto quick nfsquick
+ 
+ status=0	# success is the default!
+ 
+diff --git a/tests/generic/023 b/tests/generic/023
+index 2b1973c33869..e406ebb13a5d 100755
+--- a/tests/generic/023
++++ b/tests/generic/023
+@@ -7,7 +7,7 @@
+ # Check renameat2 syscall without flags
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/renameat2
+diff --git a/tests/generic/028 b/tests/generic/028
+index 9d646c552f81..0c795ec8d7db 100755
+--- a/tests/generic/028
++++ b/tests/generic/028
+@@ -14,7 +14,7 @@
+ # f650080 __dentry_path() fixes
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/029 b/tests/generic/029
+index 751e4f65a5ce..60dac1064bea 100755
+--- a/tests/generic/029
++++ b/tests/generic/029
+@@ -9,7 +9,7 @@
+ # the block size is smaller than the page size.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/030 b/tests/generic/030
+index 7c263702e794..7fba112ed553 100755
+--- a/tests/generic/030
++++ b/tests/generic/030
+@@ -9,7 +9,7 @@
+ # the block size is smaller than the page size.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/035 b/tests/generic/035
+index a2135d7f4151..2bd435d1dacb 100755
+--- a/tests/generic/035
++++ b/tests/generic/035
+@@ -8,7 +8,7 @@
+ #
+ seqfull=$0
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ 
+diff --git a/tests/generic/037 b/tests/generic/037
+index 55beddb49351..b81bd09a9892 100755
+--- a/tests/generic/037
++++ b/tests/generic/037
+@@ -16,7 +16,7 @@
+ #    Btrfs: make xattr replace operations atomic
+ #
+ . ./common/preamble
+-_begin_fstest auto quick attr metadata
++_begin_fstest auto quick attr metadata nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/053 b/tests/generic/053
+index d7a2ffbdd4d1..5313279583e4 100755
+--- a/tests/generic/053
++++ b/tests/generic/053
+@@ -7,7 +7,7 @@
+ # xfs_repair breaks acls
+ #
+ . ./common/preamble
+-_begin_fstest acl repair auto quick
++_begin_fstest acl repair auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/069 b/tests/generic/069
+index 5579bff299a7..6ca7d288b2fc 100755
+--- a/tests/generic/069
++++ b/tests/generic/069
+@@ -7,7 +7,7 @@
+ # Test out writes with O_APPEND flag sets.
+ #
+ . ./common/preamble
+-_begin_fstest rw udf auto quick
++_begin_fstest rw udf auto quick nfsquick
+ 
+ status=0	# success is the default!
+ _register_cleanup "rm -rf $tmp.*"
+diff --git a/tests/generic/080 b/tests/generic/080
+index 1bfc6d723a20..15c76a9761a0 100755
+--- a/tests/generic/080
++++ b/tests/generic/080
+@@ -7,7 +7,7 @@
+ # Verify that mtime is updated when writing to mmap-ed pages
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ status=0
+ 
+diff --git a/tests/generic/084 b/tests/generic/084
+index 942ee400ddf3..8e0697d128b2 100755
+--- a/tests/generic/084
++++ b/tests/generic/084
+@@ -10,7 +10,7 @@
+ # aae8a97 fs: Don't allow to create hardlink for deleted file
+ #
+ . ./common/preamble
+-_begin_fstest auto metadata quick
++_begin_fstest auto metadata quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/086 b/tests/generic/086
+index c5023081ba9e..4929cecb6f21 100755
+--- a/tests/generic/086
++++ b/tests/generic/086
+@@ -14,7 +14,7 @@
+ # "ext4: Fix data corruption caused by unwritten and delayed extents"
+ #
+ . ./common/preamble
+-_begin_fstest auto prealloc preallocrw quick
++_begin_fstest auto prealloc preallocrw quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/087 b/tests/generic/087
+index 160b32defca0..571620da4a59 100755
+--- a/tests/generic/087
++++ b/tests/generic/087
+@@ -17,7 +17,7 @@
+ # "Disable NFSv2 timestamp workaround for NFSv3+".
+ #
+ . ./common/preamble
+-_begin_fstest perms auto quick
++_begin_fstest perms auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/088 b/tests/generic/088
+index 1c17b82f399b..6cf352bcf21c 100755
+--- a/tests/generic/088
++++ b/tests/generic/088
+@@ -9,7 +9,7 @@
+ #
+ seqfull=$0
+ . ./common/preamble
+-_begin_fstest perms auto quick
++_begin_fstest perms auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/098 b/tests/generic/098
+index b947fb256dac..b11d328ed0a3 100755
+--- a/tests/generic/098
++++ b/tests/generic/098
+@@ -13,7 +13,7 @@
+ # This test is motivated by an issue found in btrfs.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick metadata
++_begin_fstest auto quick metadata nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/099 b/tests/generic/099
+index 6ba04dd8b271..ed8690aa3e3b 100755
+--- a/tests/generic/099
++++ b/tests/generic/099
+@@ -8,7 +8,7 @@
+ #
+ #!/bin/bash
+ . ./common/preamble
+-_begin_fstest acl auto quick
++_begin_fstest acl auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/103 b/tests/generic/103
+index 4efa1dc366f9..5a701e4ef97d 100755
+--- a/tests/generic/103
++++ b/tests/generic/103
+@@ -11,7 +11,7 @@
+ # ENOSPC.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick attr enospc
++_begin_fstest auto quick attr enospc nfsquick
+ 
+ _register_cleanup "_cleanup" 25
+ 
+diff --git a/tests/generic/105 b/tests/generic/105
+index b422ea349344..2b3d0ba2dcbf 100755
+--- a/tests/generic/105
++++ b/tests/generic/105
+@@ -10,7 +10,7 @@
+ #   which pulls out an earlier mod
+ #
+ . ./common/preamble
+-_begin_fstest acl auto quick
++_begin_fstest acl auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/112 b/tests/generic/112
+index 971d046756af..1709fbf26c82 100755
+--- a/tests/generic/112
++++ b/tests/generic/112
+@@ -7,7 +7,7 @@
+ # fsx (AIO variant, based on 075)
+ #
+ . ./common/preamble
+-_begin_fstest rw aio auto quick
++_begin_fstest rw aio auto quick nfsquick
+ 
+ status=0	# success is the default!
+ 
+diff --git a/tests/generic/113 b/tests/generic/113
+index cacb2425e76e..4981bf0b2d2b 100755
+--- a/tests/generic/113
++++ b/tests/generic/113
+@@ -7,7 +7,7 @@
+ # aio-stress
+ #
+ . ./common/preamble
+-_begin_fstest rw aio auto quick
++_begin_fstest rw aio auto quick nfsquick
+ 
+ status=0	# success is the default!
+ 
+diff --git a/tests/generic/116 b/tests/generic/116
+index b8816e311d76..dfb563cc1c0d 100755
+--- a/tests/generic/116
++++ b/tests/generic/116
+@@ -9,7 +9,7 @@
+ #   - Check that we still have identical contents
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/117 b/tests/generic/117
+index e23c05085d70..15207015296f 100755
+--- a/tests/generic/117
++++ b/tests/generic/117
+@@ -8,7 +8,7 @@
+ # extended attributes writes - pv 940655
+ #
+ . ./common/preamble
+-_begin_fstest attr auto quick
++_begin_fstest attr auto quick nfsquick
+ 
+ # seed and options for fsstress known to cause curruptions
+ seed=1122413794
+diff --git a/tests/generic/118 b/tests/generic/118
+index 4fa2e1e3e7de..72cfbe811709 100755
+--- a/tests/generic/118
++++ b/tests/generic/118
+@@ -10,7 +10,7 @@
+ #   - Check that we end up with identical contents in the linked ranges
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/119 b/tests/generic/119
+index fd4c36617136..38d4a169da2d 100755
+--- a/tests/generic/119
++++ b/tests/generic/119
+@@ -11,7 +11,7 @@
+ #   - Check that we end up with identical contents
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/123 b/tests/generic/123
+index f9b28abb8b91..991fd7c1e7c7 100755
+--- a/tests/generic/123
++++ b/tests/generic/123
+@@ -8,7 +8,7 @@
+ # root. Modified CXFSQA test 940960 and 940558.
+ #
+ . ./common/preamble
+-_begin_fstest perms auto quick
++_begin_fstest perms auto quick nfsquick
+ 
+ status=0	# success is the default!
+ 
+diff --git a/tests/generic/124 b/tests/generic/124
+index 2d5671605894..65f4425a3b12 100755
+--- a/tests/generic/124
++++ b/tests/generic/124
+@@ -11,7 +11,7 @@
+ # patw preallocates the file and then writes the pattern, patr checks it
+ #
+ . ./common/preamble
+-_begin_fstest pattern auto quick
++_begin_fstest pattern auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/126 b/tests/generic/126
+index 04fbd4c6dd9a..3bc1464b33a3 100755
+--- a/tests/generic/126
++++ b/tests/generic/126
+@@ -7,7 +7,7 @@
+ # tests various file permission options modified from CXFSQA test fs_perms
+ #
+ . ./common/preamble
+-_begin_fstest perms auto quick
++_begin_fstest perms auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/128 b/tests/generic/128
+index dc1d43f44134..ec7c18da023c 100755
+--- a/tests/generic/128
++++ b/tests/generic/128
+@@ -7,7 +7,7 @@
+ # Test nosuid mount option modified from CXFSQA test mount_option_nosuid
+ #
+ . ./common/preamble
+-_begin_fstest perms auto quick
++_begin_fstest perms auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/130 b/tests/generic/130
+index 39a848c2fb2e..aeb069b743f3 100755
+--- a/tests/generic/130
++++ b/tests/generic/130
+@@ -16,7 +16,7 @@
+ # - unixfile_small_vector_sync_rw
+ #
+ . ./common/preamble
+-_begin_fstest pattern auto quick
++_begin_fstest pattern auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/131 b/tests/generic/131
+index 5472ffe41a68..d6ccee2918be 100755
+--- a/tests/generic/131
++++ b/tests/generic/131
+@@ -7,7 +7,7 @@
+ # lock test created from CXFSQA test lockfile_simple
+ #
+ . ./common/preamble
+-_begin_fstest perms auto quick
++_begin_fstest perms auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/134 b/tests/generic/134
+index ab76f0460f16..864336859ab5 100755
+--- a/tests/generic/134
++++ b/tests/generic/134
+@@ -13,7 +13,7 @@
+ #   - Check that the ends of 1-3 match, and 1-3 do not match the end of file4.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/135 b/tests/generic/135
+index dc7593d58641..e2011f398d36 100755
+--- a/tests/generic/135
++++ b/tests/generic/135
+@@ -7,7 +7,7 @@
+ # Concurrent I/O to same file to ensure no deadlocks
+ #
+ . ./common/preamble
+-_begin_fstest metadata auto quick
++_begin_fstest metadata auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/138 b/tests/generic/138
+index d061ac349226..422ca132e2ad 100755
+--- a/tests/generic/138
++++ b/tests/generic/138
+@@ -10,7 +10,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/139 b/tests/generic/139
+index 0bbc222ca3d5..5592590d0d0f 100755
+--- a/tests/generic/139
++++ b/tests/generic/139
+@@ -10,7 +10,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/140 b/tests/generic/140
+index 52cf07dcf1f0..70e41264c277 100755
+--- a/tests/generic/140
++++ b/tests/generic/140
+@@ -10,7 +10,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/141 b/tests/generic/141
+index 206ccca948fb..1f6ed61250ba 100755
+--- a/tests/generic/141
++++ b/tests/generic/141
+@@ -7,7 +7,7 @@
+ # Test for xfs_io mmap read problem
+ #
+ . ./common/preamble
+-_begin_fstest rw auto quick
++_begin_fstest rw auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/144 b/tests/generic/144
+index 842d51f3ceb7..8c709e181592 100755
+--- a/tests/generic/144
++++ b/tests/generic/144
+@@ -10,7 +10,7 @@
+ #   - Check that the reflinked areas are still there.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/146 b/tests/generic/146
+index d0953fdab94b..83bc665197d0 100755
+--- a/tests/generic/146
++++ b/tests/generic/146
+@@ -11,7 +11,7 @@
+ #   - Check that the reflinked areas are still there.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone punch
++_begin_fstest auto quick clone punch nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/148 b/tests/generic/148
+index 1b321821cee3..583c7eb32512 100755
+--- a/tests/generic/148
++++ b/tests/generic/148
+@@ -12,7 +12,7 @@
+ #   - Check that the reflinked areas are still there.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/169 b/tests/generic/169
+index ea4c4d0968c4..fd76b2f4738c 100755
+--- a/tests/generic/169
++++ b/tests/generic/169
+@@ -7,7 +7,7 @@
+ # Test for file size consistency with append followed by umount/mount
+ #
+ . ./common/preamble
+-_begin_fstest rw metadata auto quick
++_begin_fstest rw metadata auto quick nfsquick
+ 
+ _show_wrote_and_stat_only()
+ {
+diff --git a/tests/generic/178 b/tests/generic/178
+index 9efb79aa4928..fbe3b2887033 100755
+--- a/tests/generic/178
++++ b/tests/generic/178
+@@ -7,7 +7,7 @@
+ # Ensure that punch-hole doesn't clobber CoW.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone punch
++_begin_fstest auto quick clone punch nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/179 b/tests/generic/179
+index d22eb714b871..95ec2629871b 100755
+--- a/tests/generic/179
++++ b/tests/generic/179
+@@ -10,7 +10,7 @@
+ #   - Check that the reflinked areas are still there.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone punch
++_begin_fstest auto quick clone punch nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/181 b/tests/generic/181
+index 2b4617be8b09..72891e3d1a55 100755
+--- a/tests/generic/181
++++ b/tests/generic/181
+@@ -10,7 +10,7 @@
+ #   - Check that the reflink happened.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/183 b/tests/generic/183
+index 77bfcfcbd904..5dd6d4ce2c76 100755
+--- a/tests/generic/183
++++ b/tests/generic/183
+@@ -13,7 +13,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/184 b/tests/generic/184
+index 9e8263e8d970..21d6316b4525 100755
+--- a/tests/generic/184
++++ b/tests/generic/184
+@@ -7,7 +7,7 @@
+ # check mknod makes working nodes.
+ #
+ . ./common/preamble
+-_begin_fstest metadata auto quick
++_begin_fstest metadata auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/185 b/tests/generic/185
+index 09469924963a..436bd4d573af 100755
+--- a/tests/generic/185
++++ b/tests/generic/185
+@@ -13,7 +13,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/188 b/tests/generic/188
+index eab77b39c3af..58deb2bee28b 100755
+--- a/tests/generic/188
++++ b/tests/generic/188
+@@ -12,7 +12,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/189 b/tests/generic/189
+index 75cca42afb94..61cd572bf45d 100755
+--- a/tests/generic/189
++++ b/tests/generic/189
+@@ -12,7 +12,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/190 b/tests/generic/190
+index 9e2207408236..cd00408f81fe 100755
+--- a/tests/generic/190
++++ b/tests/generic/190
+@@ -12,7 +12,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/191 b/tests/generic/191
+index 78b9a3f06716..abd4b746c9ef 100755
+--- a/tests/generic/191
++++ b/tests/generic/191
+@@ -12,7 +12,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/193 b/tests/generic/193
+index ddaff69bfda6..a948943f88d6 100755
+--- a/tests/generic/193
++++ b/tests/generic/193
+@@ -7,7 +7,7 @@
+ # Test permission checks in ->setattr
+ #
+ . ./common/preamble
+-_begin_fstest metadata auto quick
++_begin_fstest metadata auto quick nfsquick
+ 
+ _register_cleanup "_cleanup_files"
+ tag="added by qa $seq"
+diff --git a/tests/generic/194 b/tests/generic/194
+index ff76438d85ca..1aac96a51933 100755
+--- a/tests/generic/194
++++ b/tests/generic/194
+@@ -13,7 +13,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/195 b/tests/generic/195
+index e087b99cbf65..14a903e5bd8f 100755
+--- a/tests/generic/195
++++ b/tests/generic/195
+@@ -13,7 +13,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/196 b/tests/generic/196
+index e2ae0410ddb1..abb04e726e4f 100755
+--- a/tests/generic/196
++++ b/tests/generic/196
+@@ -12,7 +12,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/197 b/tests/generic/197
+index c5f802079a36..72100796090d 100755
+--- a/tests/generic/197
++++ b/tests/generic/197
+@@ -12,7 +12,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/198 b/tests/generic/198
+index 3c216c5d5843..df114a5b4ebc 100755
+--- a/tests/generic/198
++++ b/tests/generic/198
+@@ -8,7 +8,7 @@
+ # See also https://bugzilla.redhat.com/show_bug.cgi?id=217098
+ #
+ . ./common/preamble
+-_begin_fstest auto aio quick
++_begin_fstest auto aio quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/199 b/tests/generic/199
+index 2a8cafcc4649..29fa3c172713 100755
+--- a/tests/generic/199
++++ b/tests/generic/199
+@@ -16,7 +16,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone punch
++_begin_fstest auto quick clone punch nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/200 b/tests/generic/200
+index a1a78ef40fd8..eb70bc02cd37 100755
+--- a/tests/generic/200
++++ b/tests/generic/200
+@@ -16,7 +16,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone punch
++_begin_fstest auto quick clone punch nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/201 b/tests/generic/201
+index 2598b44a17e8..cdc03d0920b1 100755
+--- a/tests/generic/201
++++ b/tests/generic/201
+@@ -8,7 +8,7 @@
+ # unlink the file.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/202 b/tests/generic/202
+index 05354450c73f..27f8cba87e66 100755
+--- a/tests/generic/202
++++ b/tests/generic/202
+@@ -7,7 +7,7 @@
+ # See what happens if we CoW across not-block-aligned EOF.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/203 b/tests/generic/203
+index b51969c82f91..ee854ddca970 100755
+--- a/tests/generic/203
++++ b/tests/generic/203
+@@ -7,7 +7,7 @@
+ # See what happens if we DIO CoW across not-block-aligned EOF.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/207 b/tests/generic/207
+index a939d0be3286..107b0c411c04 100755
+--- a/tests/generic/207
++++ b/tests/generic/207
+@@ -7,7 +7,7 @@
+ # Run aio-dio-extend-stat - test race in dio aio completion
+ #
+ . ./common/preamble
+-_begin_fstest auto aio quick
++_begin_fstest auto aio quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/210 b/tests/generic/210
+index 1504809d09d4..e235a1c9725e 100755
+--- a/tests/generic/210
++++ b/tests/generic/210
+@@ -7,7 +7,7 @@
+ # Run aio-dio-subblock-eof-read - test AIO read of last block of DIO file
+ #
+ . ./common/preamble
+-_begin_fstest auto aio quick
++_begin_fstest auto aio quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/211 b/tests/generic/211
+index 02edd22e445b..8eb62ca88604 100755
+--- a/tests/generic/211
++++ b/tests/generic/211
+@@ -7,7 +7,7 @@
+ # Run aio-free-ring-with-bogus-nr-pages - test aio_setup_ring with bad nr_pages
+ #
+ . ./common/preamble
+-_begin_fstest auto aio quick
++_begin_fstest auto aio quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/212 b/tests/generic/212
+index 71e2724e91e2..c3460d8b7018 100755
+--- a/tests/generic/212
++++ b/tests/generic/212
+@@ -8,7 +8,7 @@
+ # Test what happens when a non-writable context pointer is passed to io_setup
+ #
+ . ./common/preamble
+-_begin_fstest auto aio quick
++_begin_fstest auto aio quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/213 b/tests/generic/213
+index ad52fbb1767e..91d52b8c61d2 100755
+--- a/tests/generic/213
++++ b/tests/generic/213
+@@ -10,7 +10,7 @@
+ # Based on xfs-specific test 072
+ #
+ . ./common/preamble
+-_begin_fstest rw auto prealloc quick enospc
++_begin_fstest rw auto prealloc quick enospc nfsquick
+ 
+ tmp=$TEST_DIR/$$
+ 
+diff --git a/tests/generic/214 b/tests/generic/214
+index 34aa3a49576c..de375feaeda3 100755
+--- a/tests/generic/214
++++ b/tests/generic/214
+@@ -7,7 +7,7 @@
+ # Basic unwritten extent sanity checks
+ #
+ . ./common/preamble
+-_begin_fstest rw auto prealloc quick
++_begin_fstest rw auto prealloc quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/215 b/tests/generic/215
+index fc3b8cef74ca..38482bebf45d 100755
+--- a/tests/generic/215
++++ b/tests/generic/215
+@@ -9,7 +9,7 @@
+ # Based on the testcase in http://bugzilla.kernel.org/show_bug.cgi?id=2645
+ #
+ . ./common/preamble
+-_begin_fstest auto metadata quick
++_begin_fstest auto metadata quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/221 b/tests/generic/221
+index 1fb44273449a..e3306d85039f 100755
+--- a/tests/generic/221
++++ b/tests/generic/221
+@@ -10,7 +10,7 @@
+ # Based on a bug report and testcase from Eric Blake <ebb9@byu.net>.
+ #
+ . ./common/preamble
+-_begin_fstest auto metadata quick
++_begin_fstest auto metadata quick nfsquick
+ 
+ # Import common functions.
+ 
+diff --git a/tests/generic/228 b/tests/generic/228
+index 92338982c85d..f51b9822aa48 100755
+--- a/tests/generic/228
++++ b/tests/generic/228
+@@ -7,7 +7,7 @@
+ # Check if fallocate respects RLIMIT_FSIZE
+ #
+ . ./common/preamble
+-_begin_fstest rw auto prealloc quick
++_begin_fstest rw auto prealloc quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/236 b/tests/generic/236
+index 76e2810c34a1..d2b452c8b6ff 100755
+--- a/tests/generic/236
++++ b/tests/generic/236
+@@ -8,7 +8,7 @@
+ # See also http://marc.info/?l=linux-btrfs&m=127434439020230&w=2
+ #
+ . ./common/preamble
+-_begin_fstest auto quick metadata
++_begin_fstest auto quick metadata nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/237 b/tests/generic/237
+index 93eafd8470ec..cb3f510a1b1d 100755
+--- a/tests/generic/237
++++ b/tests/generic/237
+@@ -8,7 +8,7 @@
+ # See also http://marc.info/?l=linux-btrfs&m=127434445620298&w=2
+ #
+ . ./common/preamble
+-_begin_fstest auto quick acl
++_begin_fstest auto quick acl nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/240 b/tests/generic/240
+index 27b5119ec907..050637dc50be 100755
+--- a/tests/generic/240
++++ b/tests/generic/240
+@@ -14,7 +14,7 @@
+ # of the device can be smaller than the file system block size.
+ #
+ . ./common/preamble
+-_begin_fstest auto aio quick rw
++_begin_fstest auto aio quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/245 b/tests/generic/245
+index e2d5c926e906..d0b0b84d8713 100755
+--- a/tests/generic/245
++++ b/tests/generic/245
+@@ -9,7 +9,7 @@
+ # Based on a bug report and testcase from  Vlado Plaga <rechner@vlado-do.de>
+ #
+ . ./common/preamble
+-_begin_fstest auto quick dir
++_begin_fstest auto quick dir nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/246 b/tests/generic/246
+index 4d474cd248d2..d103edd089dc 100755
+--- a/tests/generic/246
++++ b/tests/generic/246
+@@ -10,7 +10,7 @@
+ # Marius Tolzmann <tolzmann@molgen.mpg.de>
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/248 b/tests/generic/248
+index 3c127a879332..1de994211133 100755
+--- a/tests/generic/248
++++ b/tests/generic/248
+@@ -7,7 +7,7 @@
+ # Test for pwrite hang problem when writing from mmaped buffer of the same page 
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/249 b/tests/generic/249
+index 61fcaf90ed6b..da4920900107 100755
+--- a/tests/generic/249
++++ b/tests/generic/249
+@@ -7,7 +7,7 @@
+ # simple splice(2) test.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/253 b/tests/generic/253
+index 7d09dd0679e6..83e0521d0cb2 100755
+--- a/tests/generic/253
++++ b/tests/generic/253
+@@ -10,7 +10,7 @@
+ # the golden output; we can only compare to a check file.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/254 b/tests/generic/254
+index e0e29da6fd8a..5663782da6e2 100755
+--- a/tests/generic/254
++++ b/tests/generic/254
+@@ -10,7 +10,7 @@
+ # the golden output; we can only compare to a check file.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone punch
++_begin_fstest auto quick clone punch nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/257 b/tests/generic/257
+index 4faa25948172..a6933ee07008 100755
+--- a/tests/generic/257
++++ b/tests/generic/257
+@@ -7,7 +7,7 @@
+ # values are seekable. Most work is done by the C program here.
+ #
+ . ./common/preamble
+-_begin_fstest dir auto quick
++_begin_fstest dir auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/258 b/tests/generic/258
+index 979889e2d90f..55ada1929161 100755
+--- a/tests/generic/258
++++ b/tests/generic/258
+@@ -9,7 +9,7 @@
+ # See also commit 4d7bf11d649c72621ca31b8ea12b9c94af380e63
+ #
+ . ./common/preamble
+-_begin_fstest auto quick bigtime
++_begin_fstest auto quick bigtime nfsquick
+ 
+ # Import common functions.
+ 
+diff --git a/tests/generic/284 b/tests/generic/284
+index 729da77a13c5..22a17c9b5bbc 100755
+--- a/tests/generic/284
++++ b/tests/generic/284
+@@ -13,7 +13,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/287 b/tests/generic/287
+index 76ea26bafdfa..62f809576ca4 100755
+--- a/tests/generic/287
++++ b/tests/generic/287
+@@ -13,7 +13,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/289 b/tests/generic/289
+index ed4f3268a055..cd7bc7251b0f 100755
+--- a/tests/generic/289
++++ b/tests/generic/289
+@@ -15,7 +15,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/290 b/tests/generic/290
+index 534fb24fbef5..75806cc29bee 100755
+--- a/tests/generic/290
++++ b/tests/generic/290
+@@ -15,7 +15,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/291 b/tests/generic/291
+index 50119c03a56e..674d9174e97e 100755
+--- a/tests/generic/291
++++ b/tests/generic/291
+@@ -15,7 +15,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/292 b/tests/generic/292
+index 24cdab53957e..315dd3bed20b 100755
+--- a/tests/generic/292
++++ b/tests/generic/292
+@@ -15,7 +15,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/293 b/tests/generic/293
+index 0f1d84160866..5fa6e45b863b 100755
+--- a/tests/generic/293
++++ b/tests/generic/293
+@@ -16,7 +16,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/294 b/tests/generic/294
+index 406b1b3954b9..173efa3dabcb 100755
+--- a/tests/generic/294
++++ b/tests/generic/294
+@@ -8,7 +8,7 @@
+ # we ask to create an already-existing entity on an RO filesystem
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/295 b/tests/generic/295
+index f66c18054013..466c129f19eb 100755
+--- a/tests/generic/295
++++ b/tests/generic/295
+@@ -16,7 +16,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/296 b/tests/generic/296
+index ab348acf3b55..5eeb2ecca1aa 100755
+--- a/tests/generic/296
++++ b/tests/generic/296
+@@ -8,7 +8,7 @@
+ # - Rewrite the whole file.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/303 b/tests/generic/303
+index 95679569e46d..1c21fe7b2a70 100755
+--- a/tests/generic/303
++++ b/tests/generic/303
+@@ -7,7 +7,7 @@
+ # Check that high-offset reflinks work.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/306 b/tests/generic/306
+index d67185e89a27..161e77808941 100755
+--- a/tests/generic/306
++++ b/tests/generic/306
+@@ -7,7 +7,7 @@
+ # Test RW open of a device on a RO fs
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/307 b/tests/generic/307
+index c4e213e10db4..272a244816e7 100755
+--- a/tests/generic/307
++++ b/tests/generic/307
+@@ -14,7 +14,7 @@
+ # Based on test 277
+ #
+ . ./common/preamble
+-_begin_fstest auto quick acl
++_begin_fstest auto quick acl nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/308 b/tests/generic/308
+index 6466d3327cf4..a9644e14c284 100755
+--- a/tests/generic/308
++++ b/tests/generic/308
+@@ -8,7 +8,7 @@
+ # f17722f ext4: Fix max file size and logical block counting of extent format file
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/309 b/tests/generic/309
+index bfd3e04f8cf9..6daf417a94be 100755
+--- a/tests/generic/309
++++ b/tests/generic/309
+@@ -11,7 +11,7 @@
+ # 0b23076 ext3: fix update of mtime and ctime on rename
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ status=0	# success is the default!
+ 
+diff --git a/tests/generic/313 b/tests/generic/313
+index d4b1256d69a7..cb88c78bd33b 100755
+--- a/tests/generic/313
++++ b/tests/generic/313
+@@ -10,7 +10,7 @@
+ # 3972f26 btrfs: update timestamps on truncate()
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/314 b/tests/generic/314
+index 68a2f7164840..14946b64e97b 100755
+--- a/tests/generic/314
++++ b/tests/generic/314
+@@ -7,7 +7,7 @@
+ # Test SGID inheritance on subdirectories
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/317 b/tests/generic/317
+index 134d5e3fc326..d3fd64435a2a 100755
+--- a/tests/generic/317
++++ b/tests/generic/317
+@@ -12,7 +12,7 @@
+ # that the correct uid was flushed and brought back from disk.
+ #
+ . ./common/preamble
+-_begin_fstest auto metadata quick
++_begin_fstest auto metadata quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/318 b/tests/generic/318
+index 5edc9f35f03d..1ca8dd75449d 100755
+--- a/tests/generic/318
++++ b/tests/generic/318
+@@ -13,7 +13,7 @@
+ # the ACL was flushed and brought back from disk.
+ #
+ . ./common/preamble
+-_begin_fstest acl attr auto quick
++_begin_fstest acl attr auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/319 b/tests/generic/319
+index 082d93bcd736..d07465cc3bb3 100755
+--- a/tests/generic/319
++++ b/tests/generic/319
+@@ -12,7 +12,7 @@
+ #     https://patchwork.kernel.org/patch/3046931/
+ #
+ . ./common/preamble
+-_begin_fstest acl auto quick
++_begin_fstest acl auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/330 b/tests/generic/330
+index 9cd7b8b196a9..62ea6d52d69b 100755
+--- a/tests/generic/330
++++ b/tests/generic/330
+@@ -7,7 +7,7 @@
+ # Test AIO DIO CoW behavior.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/332 b/tests/generic/332
+index 61147590ee2c..c91c86978944 100755
+--- a/tests/generic/332
++++ b/tests/generic/332
+@@ -7,7 +7,7 @@
+ # Test AIO CoW behavior.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/337 b/tests/generic/337
+index d0dffcb9b33e..e90c6f70a2ec 100755
+--- a/tests/generic/337
++++ b/tests/generic/337
+@@ -8,7 +8,7 @@
+ # all the xattrs an inode has.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick attr metadata
++_begin_fstest auto quick attr metadata nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/346 b/tests/generic/346
+index 009db54f17e2..3c8aa8ce8694 100755
+--- a/tests/generic/346
++++ b/tests/generic/346
+@@ -7,7 +7,7 @@
+ # Test races between mmap and normal writes from racing threads
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # get standard environment and checks
+ 
+diff --git a/tests/generic/355 b/tests/generic/355
+index 4bc69eeb3ed5..1288779afd6d 100755
+--- a/tests/generic/355
++++ b/tests/generic/355
+@@ -7,7 +7,7 @@
+ # Test clear of suid/sgid on direct write.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/356 b/tests/generic/356
+index ffc7bed5334c..a6437aa33036 100755
+--- a/tests/generic/356
++++ b/tests/generic/356
+@@ -7,7 +7,7 @@
+ # Check that we can't reflink a swapfile.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone swap
++_begin_fstest auto quick clone swap nfsquick
+ 
+ _register_cleanup "_cleanup" BUS
+ 
+diff --git a/tests/generic/357 b/tests/generic/357
+index ce748f854327..41e5cc7a3280 100755
+--- a/tests/generic/357
++++ b/tests/generic/357
+@@ -7,7 +7,7 @@
+ # Check that we can't swapon a reflinked file.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone swap
++_begin_fstest auto quick clone swap nfsquick
+ 
+ _register_cleanup "_cleanup" BUS
+ 
+diff --git a/tests/generic/358 b/tests/generic/358
+index 8c73ba3617b7..ac6777b85e11 100755
+--- a/tests/generic/358
++++ b/tests/generic/358
+@@ -11,7 +11,7 @@
+ # change 2 of the owners, and so on.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ _register_cleanup "_cleanup" BUS
+ 
+diff --git a/tests/generic/359 b/tests/generic/359
+index 25692058e8bf..02fe616a0e30 100755
+--- a/tests/generic/359
++++ b/tests/generic/359
+@@ -13,7 +13,7 @@
+ # exactly with the block mapping records.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ _register_cleanup "_cleanup" BUS
+ 
+diff --git a/tests/generic/360 b/tests/generic/360
+index 5fb227fff393..ae85ee1a7c02 100755
+--- a/tests/generic/360
++++ b/tests/generic/360
+@@ -7,7 +7,7 @@
+ # Test symlink to very long path, check symlink file contains correct path.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick metadata
++_begin_fstest auto quick metadata nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/373 b/tests/generic/373
+index 2f68b24f284e..1edd5f107cf9 100755
+--- a/tests/generic/373
++++ b/tests/generic/373
+@@ -7,7 +7,7 @@
+ # Check that cross-mountpoint reflink doesn't work.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ _register_cleanup "_cleanup" BUS
+ 
+diff --git a/tests/generic/375 b/tests/generic/375
+index 746cdd5586db..bdf2268a23f7 100755
+--- a/tests/generic/375
++++ b/tests/generic/375
+@@ -8,7 +8,7 @@
+ # owning group.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick acl
++_begin_fstest auto quick acl nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/377 b/tests/generic/377
+index 720ecf73c327..e585a09870d6 100755
+--- a/tests/generic/377
++++ b/tests/generic/377
+@@ -7,7 +7,7 @@
+ # Test listxattr syscall behaviour with different buffer sizes.
+ #
+ . ./common/preamble
+-_begin_fstest attr auto quick metadata
++_begin_fstest attr auto quick metadata nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/378 b/tests/generic/378
+index 2caff94f33a8..91db0a82d00d 100755
+--- a/tests/generic/378
++++ b/tests/generic/378
+@@ -13,7 +13,7 @@
+ # 51f7e52 ovl: share inode for hard link
+ #
+ . ./common/preamble
+-_begin_fstest auto quick metadata
++_begin_fstest auto quick metadata nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/391 b/tests/generic/391
+index 748af9d89e0c..5e4bd90e82b2 100755
+--- a/tests/generic/391
++++ b/tests/generic/391
+@@ -9,7 +9,7 @@
+ # to spurious -EEXIST failures from direct I/O reads.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/393 b/tests/generic/393
+index 206dee00e419..d1d9ea700ff7 100755
+--- a/tests/generic/393
++++ b/tests/generic/393
+@@ -17,7 +17,7 @@
+ # In f2fs, up to 3.4KB of data can be embedded into 4KB-sized inode block.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/394 b/tests/generic/394
+index fc03e2f32a78..059692b8e337 100755
+--- a/tests/generic/394
++++ b/tests/generic/394
+@@ -7,7 +7,7 @@
+ # Make sure fs honors file size resource limit.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/401 b/tests/generic/401
+index dc8e9fa6871f..c24424972b5d 100755
+--- a/tests/generic/401
++++ b/tests/generic/401
+@@ -16,7 +16,7 @@
+ # verify getting DT_UNKNOWN IFF feature is disabled.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/406 b/tests/generic/406
+index 49279a009b82..b54f0883d235 100755
+--- a/tests/generic/406
++++ b/tests/generic/406
+@@ -11,7 +11,7 @@
+ #   Btrfs: adjust outstanding_extents counter properly when dio write is split
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/407 b/tests/generic/407
+index 90ccaef0e9c3..68b06223ca89 100755
+--- a/tests/generic/407
++++ b/tests/generic/407
+@@ -7,7 +7,7 @@
+ # Verify that mtime is updated when cloning files
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone metadata
++_begin_fstest auto quick clone metadata nfsquick
+ 
+ status=0
+ 
+diff --git a/tests/generic/412 b/tests/generic/412
+index f1778cf88adb..b17e60637e0c 100755
+--- a/tests/generic/412
++++ b/tests/generic/412
+@@ -10,7 +10,7 @@
+ # correct size and no data loss happened.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick metadata
++_begin_fstest auto quick metadata nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/420 b/tests/generic/420
+index 5c67490dbc67..857b847e7f8a 100755
+--- a/tests/generic/420
++++ b/tests/generic/420
+@@ -8,7 +8,7 @@
+ # not alter the file size.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick punch
++_begin_fstest auto quick punch nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/423 b/tests/generic/423
+index 69c1c3bceff3..f61c8c431e70 100755
+--- a/tests/generic/423
++++ b/tests/generic/423
+@@ -7,7 +7,7 @@
+ # Test the statx system call
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/426 b/tests/generic/426
+index 45e4a6d83bab..6b98aa045949 100755
+--- a/tests/generic/426
++++ b/tests/generic/426
+@@ -8,7 +8,7 @@
+ # and non-stale handles pointing to linked files
+ #
+ . ./common/preamble
+-_begin_fstest auto quick exportfs
++_begin_fstest auto quick exportfs nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/428 b/tests/generic/428
+index 4073afc4a772..84d35c607a9e 100755
+--- a/tests/generic/428
++++ b/tests/generic/428
+@@ -9,7 +9,7 @@
+ # created by Ross Zwisler <ross.zwisler@linux.intel.com>
+ #
+ . ./common/preamble
+-_begin_fstest auto quick dax
++_begin_fstest auto quick dax nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/430 b/tests/generic/430
+index 697c83cecdd5..28604e35e1a6 100755
+--- a/tests/generic/430
++++ b/tests/generic/430
+@@ -11,7 +11,7 @@
+ #   - Copy end of original to new file
+ #   - Copy middle of original to a new file, creating a hole
+ . ./common/preamble
+-_begin_fstest auto quick copy_range
++_begin_fstest auto quick copy_range nfsquick
+ 
+ # get standard environment
+ . common/filter
+diff --git a/tests/generic/431 b/tests/generic/431
+index 0ec398c79112..28a1bd477c78 100755
+--- a/tests/generic/431
++++ b/tests/generic/431
+@@ -8,7 +8,7 @@
+ #   - Copy a small file
+ #   - Small copies from various points in the original file
+ . ./common/preamble
+-_begin_fstest auto quick copy_range
++_begin_fstest auto quick copy_range nfsquick
+ 
+ # get standard environment
+ . common/filter
+diff --git a/tests/generic/432 b/tests/generic/432
+index 402c5f231a7c..88e93d98c253 100755
+--- a/tests/generic/432
++++ b/tests/generic/432
+@@ -10,7 +10,7 @@
+ #   - Use copy to swap data in the middle
+ #   - Use copy to simultaneously overwrite and append to destination file
+ . ./common/preamble
+-_begin_fstest auto quick copy_range
++_begin_fstest auto quick copy_range nfsquick
+ 
+ # get standard environment
+ . common/filter
+diff --git a/tests/generic/433 b/tests/generic/433
+index 0d26a64c63dd..54884db73b0b 100755
+--- a/tests/generic/433
++++ b/tests/generic/433
+@@ -10,7 +10,7 @@
+ #   - Use copy to swap data in the middle
+ #   - Use copy to swap data in a small file
+ . ./common/preamble
+-_begin_fstest auto quick copy_range
++_begin_fstest auto quick copy_range nfsquick
+ 
+ # get standard environment
+ . common/filter
+diff --git a/tests/generic/434 b/tests/generic/434
+index fbd9e4088868..c9e31bc5232e 100755
+--- a/tests/generic/434
++++ b/tests/generic/434
+@@ -6,7 +6,7 @@
+ #
+ # Tests vfs_copy_file_range() error checking
+ . ./common/preamble
+-_begin_fstest auto quick copy_range
++_begin_fstest auto quick copy_range nfsquick
+ 
+ # get standard environment
+ . common/filter
+diff --git a/tests/generic/436 b/tests/generic/436
+index 7fb24b41c0f3..c70fa4cd1ab8 100755
+--- a/tests/generic/436
++++ b/tests/generic/436
+@@ -7,7 +7,7 @@
+ # More SEEK_DATA/SEEK_HOLE sanity tests.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw seek prealloc
++_begin_fstest auto quick rw seek prealloc nfsquick
+ 
+ tmp=$$
+ 
+diff --git a/tests/generic/437 b/tests/generic/437
+index 1bfc6dbcf8a6..745732912e66 100755
+--- a/tests/generic/437
++++ b/tests/generic/437
+@@ -10,7 +10,7 @@
+ # created by Ross Zwisler <ross.zwisler@linux.intel.com>
+ #
+ . ./common/preamble
+-_begin_fstest auto quick dax
++_begin_fstest auto quick dax nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/439 b/tests/generic/439
+index 4a4f821f740c..86377b3a8a8e 100755
+--- a/tests/generic/439
++++ b/tests/generic/439
+@@ -11,7 +11,7 @@
+ # correct after remounting the filesystem.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick punch
++_begin_fstest auto quick punch nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/443 b/tests/generic/443
+index 16baf14daf56..90c4b7a3615f 100755
+--- a/tests/generic/443
++++ b/tests/generic/443
+@@ -7,7 +7,7 @@
+ # Takes page fault while writev is iterating over the vectors in the IOV
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/444 b/tests/generic/444
+index 8f6b7c2c77ca..70848be755bc 100755
+--- a/tests/generic/444
++++ b/tests/generic/444
+@@ -8,7 +8,7 @@
+ # in the owning group and directory has default ACLs.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick acl
++_begin_fstest auto quick acl nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/445 b/tests/generic/445
+index 05d1c5b344da..bbb3b60a8965 100755
+--- a/tests/generic/445
++++ b/tests/generic/445
+@@ -7,7 +7,7 @@
+ # Another SEEK_DATA/SEEK_HOLE sanity test.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw seek prealloc
++_begin_fstest auto quick rw seek prealloc nfsquick
+ 
+ tmp=$$
+ 
+diff --git a/tests/generic/446 b/tests/generic/446
+index 5f2d2edde03b..c937b9942b5c 100755
+--- a/tests/generic/446
++++ b/tests/generic/446
+@@ -12,7 +12,7 @@
+ # will trigger a BUG_ON().
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw punch
++_begin_fstest auto quick rw punch nfsquick
+ 
+ # get standard environment and checks
+ . ./common/filter
+diff --git a/tests/generic/448 b/tests/generic/448
+index d66967bc60dc..42a1482d65bf 100755
+--- a/tests/generic/448
++++ b/tests/generic/448
+@@ -7,7 +7,7 @@
+ # Check what happens when SEEK_HOLE/SEEK_DATA are fed negative offsets.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw seek
++_begin_fstest auto quick rw seek nfsquick
+ 
+ BASE_TEST_FILE=$TEST_DIR/seek_sanity_testfile_$seq
+ 
+diff --git a/tests/generic/450 b/tests/generic/450
+index 160097cffda9..f0c6fe175cc9 100755
+--- a/tests/generic/450
++++ b/tests/generic/450
+@@ -15,7 +15,7 @@
+ # from dio read beyond eof"
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/451 b/tests/generic/451
+index 1792383abe2e..be255a515517 100755
+--- a/tests/generic/451
++++ b/tests/generic/451
+@@ -8,7 +8,7 @@
+ # direct writes a file.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw aio
++_begin_fstest auto quick rw aio nfsquick
+ 
+ # Import common functions.
+ 
+diff --git a/tests/generic/452 b/tests/generic/452
+index 6e14a1c4e7b0..0bbaeb73647f 100755
+--- a/tests/generic/452
++++ b/tests/generic/452
+@@ -9,7 +9,7 @@
+ # created by Ross Zwisler <ross.zwisler@linux.intel.com>
+ #
+ . ./common/preamble
+-_begin_fstest auto quick dax
++_begin_fstest auto quick dax nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/460 b/tests/generic/460
+index 68720d3a9f63..42c6d6af83a3 100755
+--- a/tests/generic/460
++++ b/tests/generic/460
+@@ -15,7 +15,7 @@
+ # the test from being a generic test.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ testfile=$SCRATCH_MNT/1G_file.$seq
+ file_size=$((1024 * 1024 * 1024))
+diff --git a/tests/generic/463 b/tests/generic/463
+index 719e98c5f696..a53ba0b9b0e2 100755
+--- a/tests/generic/463
++++ b/tests/generic/463
+@@ -7,7 +7,7 @@
+ # Test racy COW AIO write completions.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/465 b/tests/generic/465
+index 73fdfb5548af..26b450d4df2b 100755
+--- a/tests/generic/465
++++ b/tests/generic/465
+@@ -8,7 +8,7 @@
+ # Test i_size is updated properly under dio read/write
+ #
+ . ./common/preamble
+-_begin_fstest auto rw quick aio
++_begin_fstest auto rw quick aio nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/467 b/tests/generic/467
+index 2a86ea76c4ad..743c1c90fc79 100755
+--- a/tests/generic/467
++++ b/tests/generic/467
+@@ -13,7 +13,7 @@
+ # - open by file handle of renamed files
+ #
+ . ./common/preamble
+-_begin_fstest auto quick exportfs
++_begin_fstest auto quick exportfs nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/472 b/tests/generic/472
+index a64735caa49f..8b9bc4252121 100755
+--- a/tests/generic/472
++++ b/tests/generic/472
+@@ -7,7 +7,7 @@
+ # Test various swapfile activation oddities.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick swap
++_begin_fstest auto quick swap nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/477 b/tests/generic/477
+index d1fce7ed927f..00907e23427d 100755
+--- a/tests/generic/477
++++ b/tests/generic/477
+@@ -10,7 +10,7 @@
+ # decoding file handles after cycle mount and after directory renames.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick exportfs
++_begin_fstest auto quick exportfs nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/478 b/tests/generic/478
+index 480762d2241b..ea417781897e 100755
+--- a/tests/generic/478
++++ b/tests/generic/478
+@@ -84,7 +84,7 @@
+ #	+ dup and close newfd
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/486 b/tests/generic/486
+index 7de198f93a71..a37e9ba4611a 100755
+--- a/tests/generic/486
++++ b/tests/generic/486
+@@ -14,7 +14,7 @@
+ # form during ATTR_REPLACE") fixed the xfs bug.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick attr
++_begin_fstest auto quick attr nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/490 b/tests/generic/490
+index f4fb67be2471..ca88e808626a 100755
+--- a/tests/generic/490
++++ b/tests/generic/490
+@@ -10,7 +10,7 @@
+ # length detection in ext4_ind_map_blocks()"
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw seek
++_begin_fstest auto quick rw seek nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/494 b/tests/generic/494
+index b41c938d14f4..5ac71eb2f799 100755
+--- a/tests/generic/494
++++ b/tests/generic/494
+@@ -7,7 +7,7 @@
+ # Test truncation/hole punching of an active swapfile.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick swap punch
++_begin_fstest auto quick swap punch nfsquick
+ 
+ . ./common/filter
+ 
+diff --git a/tests/generic/495 b/tests/generic/495
+index 608f1715f24d..647d15731429 100755
+--- a/tests/generic/495
++++ b/tests/generic/495
+@@ -7,7 +7,7 @@
+ # Test invalid swap file (with holes)
+ #
+ . ./common/preamble
+-_begin_fstest auto quick swap
++_begin_fstest auto quick swap nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/496 b/tests/generic/496
+index 4aeaffd31946..026ad8465758 100755
+--- a/tests/generic/496
++++ b/tests/generic/496
+@@ -8,7 +8,7 @@
+ # fallocated swapfiles (for given fs ext4/xfs)
+ #
+ . ./common/preamble
+-_begin_fstest auto quick swap prealloc
++_begin_fstest auto quick swap prealloc nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/504 b/tests/generic/504
+index 038ab0f2c227..5ed2b0a838a6 100755
+--- a/tests/generic/504
++++ b/tests/generic/504
+@@ -11,7 +11,7 @@
+ # by flock(1) command. Checking /proc/locks for the lock info.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick locks
++_begin_fstest auto quick locks nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/513 b/tests/generic/513
+index dc082787ae4e..1f5939882929 100755
+--- a/tests/generic/513
++++ b/tests/generic/513
+@@ -7,7 +7,7 @@
+ # Ensure that ctime is updated and capabilities are cleared when reflinking.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/514 b/tests/generic/514
+index 5b83771817fd..a9b8f882eb07 100755
+--- a/tests/generic/514
++++ b/tests/generic/514
+@@ -7,7 +7,7 @@
+ # Ensure that file size resource limits are respected when reflinking.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/518 b/tests/generic/518
+index f3cb5868c816..9adab994b00a 100755
+--- a/tests/generic/518
++++ b/tests/generic/518
+@@ -11,7 +11,7 @@
+ # undefined.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/523 b/tests/generic/523
+index 0792a39ff520..ae137bc14d4c 100755
+--- a/tests/generic/523
++++ b/tests/generic/523
+@@ -7,7 +7,7 @@
+ # Check that xattrs can have slashes in their name.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick attr
++_begin_fstest auto quick attr nfsquick
+ 
+ # Import common functions.
+ . ./common/attr
+diff --git a/tests/generic/524 b/tests/generic/524
+index 80907a4c7082..4ff32c89f0f0 100755
+--- a/tests/generic/524
++++ b/tests/generic/524
+@@ -14,7 +14,7 @@
+ # mapping unconverted.
+ 
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ 
+diff --git a/tests/generic/525 b/tests/generic/525
+index 431ba2cd0684..3935cb82cb22 100755
+--- a/tests/generic/525
++++ b/tests/generic/525
+@@ -12,7 +12,7 @@
+ # do not support mkfs_sized.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/529 b/tests/generic/529
+index 05be2c4ffd28..f594548b7a50 100755
+--- a/tests/generic/529
++++ b/tests/generic/529
+@@ -8,7 +8,7 @@
+ # is a particularly well crafted size on a filesystem that supports posix acls.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick acl attr
++_begin_fstest auto quick acl attr nfsquick
+ 
+ # Import common functions.
+ . ./common/attr
+diff --git a/tests/generic/532 b/tests/generic/532
+index d356b0da22c3..6fc0fae8aae4 100755
+--- a/tests/generic/532
++++ b/tests/generic/532
+@@ -9,7 +9,7 @@
+ # reporting supported extra file attributes for statx()")
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/533 b/tests/generic/533
+index 85b39fb15b0d..47b9b5681aca 100755
+--- a/tests/generic/533
++++ b/tests/generic/533
+@@ -9,7 +9,7 @@
+ # Simple attr smoke tests for user EAs, dereived from generic/097.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick attr
++_begin_fstest auto quick attr nfsquick
+ 
+ file=$TEST_DIR/foo.$seq
+ 
+diff --git a/tests/generic/538 b/tests/generic/538
+index f6f5496b4f24..91f0ad60f235 100755
+--- a/tests/generic/538
++++ b/tests/generic/538
+@@ -19,7 +19,7 @@
+ # block.)
+ #
+ . ./common/preamble
+-_begin_fstest auto quick aio
++_begin_fstest auto quick aio nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/539 b/tests/generic/539
+index f6feda113ab6..2460cfe3b913 100755
+--- a/tests/generic/539
++++ b/tests/generic/539
+@@ -7,7 +7,7 @@
+ # Check that SEEK_HOLE can find a punched hole.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick punch seek
++_begin_fstest auto quick punch seek nfsquick
+ 
+ # Import common functions.
+ 
+diff --git a/tests/generic/540 b/tests/generic/540
+index 38e00f97e65e..aa5fb8306477 100755
+--- a/tests/generic/540
++++ b/tests/generic/540
+@@ -17,7 +17,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/541 b/tests/generic/541
+index 89b2adadef55..434ac83a3518 100755
+--- a/tests/generic/541
++++ b/tests/generic/541
+@@ -17,7 +17,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/542 b/tests/generic/542
+index e7682f593eba..d4533abf4e24 100755
+--- a/tests/generic/542
++++ b/tests/generic/542
+@@ -17,7 +17,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/543 b/tests/generic/543
+index 624cfc410856..55c495cc8e83 100755
+--- a/tests/generic/543
++++ b/tests/generic/543
+@@ -17,7 +17,7 @@
+ #   - Check that the files are now different where we say they're different.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/544 b/tests/generic/544
+index 4dbaea4de092..577c21780878 100755
+--- a/tests/generic/544
++++ b/tests/generic/544
+@@ -11,7 +11,7 @@
+ # which have per-inode sharing groups and therefore have to check that we don't
+ # try to link data between disjoint sharing groups.
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/554 b/tests/generic/554
+index b9efee0d2c2f..7c97fd0df262 100755
+--- a/tests/generic/554
++++ b/tests/generic/554
+@@ -10,7 +10,7 @@
+ #   96e6e8f4a68d ("vfs: add missing checks to copy_file_range")
+ #
+ . ./common/preamble
+-_begin_fstest auto quick copy_range swap
++_begin_fstest auto quick copy_range swap nfsquick
+ 
+ _register_cleanup "_cleanup" BUS
+ 
+diff --git a/tests/generic/565 b/tests/generic/565
+index fd71d1e39090..64024c0fbd86 100755
+--- a/tests/generic/565
++++ b/tests/generic/565
+@@ -10,7 +10,7 @@
+ # 5dae222a5ff0 vfs: allow copy_file_range to copy across devices
+ #
+ . ./common/preamble
+-_begin_fstest auto quick copy_range
++_begin_fstest auto quick copy_range nfsquick
+ 
+ _register_cleanup "_cleanup" BUS
+ 
+diff --git a/tests/generic/567 b/tests/generic/567
+index 3f5907c336e7..697e8f9bb6fd 100755
+--- a/tests/generic/567
++++ b/tests/generic/567
+@@ -11,7 +11,7 @@
+ # (generic/029 is a similar test but for truncate.)
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw punch
++_begin_fstest auto quick rw punch nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/568 b/tests/generic/568
+index 958e5e9448a6..c21f995a68d7 100755
+--- a/tests/generic/568
++++ b/tests/generic/568
+@@ -8,7 +8,7 @@
+ # touched by that range
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw prealloc
++_begin_fstest auto quick rw prealloc nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/569 b/tests/generic/569
+index c5dcfefe2fda..55b55d623b90 100755
+--- a/tests/generic/569
++++ b/tests/generic/569
+@@ -7,7 +7,7 @@
+ # Check that we can't modify a file that's an active swap file.
+ 
+ . ./common/preamble
+-_begin_fstest auto quick rw swap prealloc
++_begin_fstest auto quick rw swap prealloc nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/571 b/tests/generic/571
+index bd5737fae3f9..04bb9c7d9975 100755
+--- a/tests/generic/571
++++ b/tests/generic/571
+@@ -7,7 +7,7 @@
+ # lease test
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/578 b/tests/generic/578
+index 01929a280f8c..45d8bb919cc9 100755
+--- a/tests/generic/578
++++ b/tests/generic/578
+@@ -7,7 +7,7 @@
+ # Make sure that we can handle multiple mmap writers to the same file.
+ 
+ . ./common/preamble
+-_begin_fstest auto quick rw clone
++_begin_fstest auto quick rw clone nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/586 b/tests/generic/586
+index 8fe6567fc522..218e27eb3c77 100755
+--- a/tests/generic/586
++++ b/tests/generic/586
+@@ -9,7 +9,7 @@
+ # with a two-block file.
+ 
+ . ./common/preamble
+-_begin_fstest auto quick rw prealloc
++_begin_fstest auto quick rw prealloc nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/591 b/tests/generic/591
+index 5efc5136f31a..2070b460af3a 100755
+--- a/tests/generic/591
++++ b/tests/generic/591
+@@ -7,7 +7,7 @@
+ # Test using splice() to read from pipes.
+ 
+ . ./common/preamble
+-_begin_fstest auto quick rw pipe splice
++_begin_fstest auto quick rw pipe splice nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/597 b/tests/generic/597
+index aa93237ee765..5b2c7c0cdf25 100755
+--- a/tests/generic/597
++++ b/tests/generic/597
+@@ -7,7 +7,7 @@
+ # Test protected_symlink and protected_hardlink sysctls
+ #
+ . ./common/preamble
+-_begin_fstest auto quick perms
++_begin_fstest auto quick perms nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/598 b/tests/generic/598
+index 160e6d4bc1fe..bd4223ca3664 100755
+--- a/tests/generic/598
++++ b/tests/generic/598
+@@ -7,7 +7,7 @@
+ # Test protected_regular and protected_fifos sysctls
+ #
+ . ./common/preamble
+-_begin_fstest auto quick perms
++_begin_fstest auto quick perms nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/604 b/tests/generic/604
+index 3c6b76a4b604..78c7b05b0532 100755
+--- a/tests/generic/604
++++ b/tests/generic/604
+@@ -8,7 +8,7 @@
+ # Check that a new mount racing with such a delayed umount succeeds.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick mount
++_begin_fstest auto quick mount nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/609 b/tests/generic/609
+index f955e986ec5d..c4c4775fa04d 100755
+--- a/tests/generic/609
++++ b/tests/generic/609
+@@ -9,7 +9,7 @@
+ # their locking isn't compatible.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+diff --git a/tests/generic/611 b/tests/generic/611
+index 3dfeb02b5f4b..d882216115d0 100755
+--- a/tests/generic/611
++++ b/tests/generic/611
+@@ -11,7 +11,7 @@
+ # f4020438fab0 ("xfs: fix boundary test in xfs_attr_shortform_verify")
+ 
+ . ./common/preamble
+-_begin_fstest auto quick attr
++_begin_fstest auto quick attr nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/612 b/tests/generic/612
+index dd17944d1ea9..330ca648c091 100755
+--- a/tests/generic/612
++++ b/tests/generic/612
+@@ -12,7 +12,7 @@
+ # aee38af574a1 "xfs: trim IO to found COW extent limit"
+ #
+ . ./common/preamble
+-_begin_fstest auto quick clone
++_begin_fstest auto quick clone nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/614 b/tests/generic/614
+index 06630f2249c7..ea10810296f8 100755
+--- a/tests/generic/614
++++ b/tests/generic/614
+@@ -8,7 +8,7 @@
+ # stat(2) reports a non-zero number of used blocks.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/618 b/tests/generic/618
+index 992b8457c3bc..e46efbb66bfc 100755
+--- a/tests/generic/618
++++ b/tests/generic/618
+@@ -12,7 +12,7 @@
+ # ada49d64fb35 ("xfs: fix forkoff miscalculation related to XFS_LITINO(mp)")
+ 
+ . ./common/preamble
+-_begin_fstest auto quick attr
++_begin_fstest auto quick attr nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/632 b/tests/generic/632
+index 4d6928a6e57c..ba7a0ffedd09 100755
+--- a/tests/generic/632
++++ b/tests/generic/632
+@@ -17,7 +17,7 @@
+ # targets that reside on shared mounts") fixed the bug.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick mount
++_begin_fstest auto quick mount nfsquick
+ 
+ _supported_fs generic
+ _require_test
+diff --git a/tests/generic/634 b/tests/generic/634
+index 5cdae584ccb5..fbf1224069e0 100755
+--- a/tests/generic/634
++++ b/tests/generic/634
+@@ -19,7 +19,7 @@
+ # for an update.
+ 
+ . ./common/preamble
+-_begin_fstest auto quick atime bigtime
++_begin_fstest auto quick atime bigtime nfsquick
+ 
+ # Import common functions.
+ 
+diff --git a/tests/generic/636 b/tests/generic/636
+index 10e658b68a55..f7623bb782eb 100755
+--- a/tests/generic/636
++++ b/tests/generic/636
+@@ -8,7 +8,7 @@
+ # Empty swap file (only swap header)
+ #
+ . ./common/preamble
+-_begin_fstest auto quick swap
++_begin_fstest auto quick swap nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/637 b/tests/generic/637
+index 8805a171a638..8d72a7ada17d 100755
+--- a/tests/generic/637
++++ b/tests/generic/637
+@@ -6,7 +6,7 @@
+ # by a new open fd
+ #
+ . ./common/preamble
+-_begin_fstest auto quick dir
++_begin_fstest auto quick dir nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/638 b/tests/generic/638
+index fff25e66470c..b2552ea707dd 100755
+--- a/tests/generic/638
++++ b/tests/generic/638
+@@ -20,7 +20,7 @@
+ #   4f06dd92b5d0 ("fuse: fix write deadlock")
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/639 b/tests/generic/639
+index c30f7644a2fc..16b5dfde273c 100755
+--- a/tests/generic/639
++++ b/tests/generic/639
+@@ -11,7 +11,7 @@
+ # Prompted by a bug in ceph_write_begin that was fixed by commit 827a746f405d.
+ #
+ . ./common/preamble
+-_begin_fstest auto quick rw
++_begin_fstest auto quick rw nfsquick
+ 
+ # Import common functions.
+ . ./common/filter
+diff --git a/tests/generic/647 b/tests/generic/647
+index fa6edadc9081..4dd5cfef09d4 100755
+--- a/tests/generic/647
++++ b/tests/generic/647
+@@ -7,7 +7,7 @@
+ # Trigger page faults in the same file during read and write
+ #
+ . ./common/preamble
+-_begin_fstest auto quick
++_begin_fstest auto quick nfsquick
+ 
+ # Override the default cleanup function.
+ _cleanup()
+-- 
+2.34.1
+