14993 zfs-tests: Move platform independent tests to a shared runfile

Reviewed by: Andy Fiddaman <illumos@fiddaman.net>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>

8 files changed, 413 insertions, 2300 deletions

diff --git a/usr/src/pkg/manifests/system-test-zfstest.p5m b/usr/src/pkg/manifests/system-test-zfstest.p5m
index 77b44da29e..cedb3bc434 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.p5m
+++ b/usr/src/pkg/manifests/system-test-zfstest.p5m
@@ -62,7 +62,7 @@ file path=opt/zfs-tests/include/math.shlib mode=0444
 file path=opt/zfs-tests/include/properties.shlib mode=0444
 file path=opt/zfs-tests/include/zpool_script.shlib mode=0444
 dir  path=opt/zfs-tests/runfiles
-file path=opt/zfs-tests/runfiles/delphix.run mode=0444
+file path=opt/zfs-tests/runfiles/common.run mode=0444
 file path=opt/zfs-tests/runfiles/longevity.run mode=0444
 file path=opt/zfs-tests/runfiles/omnios.run mode=0444
 file path=opt/zfs-tests/runfiles/openindiana.run mode=0444
diff --git a/usr/src/test/test-runner/cmd/Makefile b/usr/src/test/test-runner/cmd/Makefile
index 68acf3b23c..080d143e38 100644
--- a/usr/src/test/test-runner/cmd/Makefile
+++ b/usr/src/test/test-runner/cmd/Makefile
@@ -24,7 +24,7 @@ PROGS = run
 CMDS = $(PROGS:%=$(ROOTBIN)/%)
 $(CMDS) := FILEMODE = 0555
 
-all lint clean clobber:
+all clean clobber:
 
 install: $(CMDS)
 
diff --git a/usr/src/test/test-runner/cmd/run b/usr/src/test/test-runner/cmd/run
index 1c443d3b5e..21da73daff 100644
--- a/usr/src/test/test-runner/cmd/run
+++ b/usr/src/test/test-runner/cmd/run
@@ -47,6 +47,7 @@ from threading import Timer
 from time import time
 
 BASEDIR = '/var/tmp/test_results'
+TESTDIR = '/opt/zfs-tests/'
 KILL = '/usr/bin/kill'
 TRUE = '/usr/bin/true'
 SUDO = '/usr/bin/sudo'
@@ -167,8 +168,10 @@ class Output(object):
 class Cmd(object):
     verified_users = []
 
-    def __init__(self, pathname, outputdir=None, timeout=None, user=None):
+    def __init__(self, pathname, identifier=None, outputdir=None,
+                 timeout=None, user=None, tags=None):
         self.pathname = pathname
+        self.identifier = identifier
         self.outputdir = outputdir or 'BASEDIR'
         self.timeout = timeout
         self.user = user or ''
@@ -179,8 +182,13 @@ class Cmd(object):
             self.timeout = 60
 
     def __str__(self):
-        return "Pathname: %s\nOutputdir: %s\nTimeout: %s\nUser: %s\n" % \
-            (self.pathname, self.outputdir, self.timeout, self.user)
+        return '''\
+Pathname: %s
+Identifier: %s
+Outputdir: %s
+Timeout: %d
+User: %s
+''' % (self.pathname, self.identifier, self.outputdir, self.timeout, self.user)
 
     def kill_cmd(self, proc):
         """
@@ -298,7 +306,10 @@ class Cmd(object):
 
         logname = getpwuid(os.getuid()).pw_name
         user = ' (run as %s)' % (self.user if len(self.user) else logname)
-        msga = 'Test: %s%s ' % (self.pathname, user)
+        if self.identifier:
+            msga = 'Test (%s): %s%s ' % (self.identifier, self.pathname, user)
+        else:
+            msga = 'Test: %s%s ' % (self.pathname, user)
         msgb = '[%s] [%s]' % (self.result.runtime, self.result.result)
         pad = ' ' * (80 - (len(msga) + len(msgb)))
 
@@ -343,15 +354,17 @@ class Cmd(object):
 
 class Test(Cmd):
     props = ['outputdir', 'timeout', 'user', 'pre', 'pre_user', 'post',
-             'post_user']
+             'post_user', 'tags']
 
-    def __init__(self, pathname, outputdir=None, timeout=None, user=None,
-                 pre=None, pre_user=None, post=None, post_user=None):
-        super(Test, self).__init__(pathname, outputdir, timeout, user)
+    def __init__(self, pathname,
+                 pre=None, pre_user=None, post=None, post_user=None,
+                 tags=None, **kwargs):
+        super(Test, self).__init__(pathname, **kwargs)
         self.pre = pre or ''
         self.pre_user = pre_user or ''
         self.post = post or ''
         self.post_user = post_user or ''
+        self.tags = tags or []
 
     def __str__(self):
         post_user = pre_user = ''
@@ -359,10 +372,17 @@ class Test(Cmd):
             pre_user = ' (as %s)' % (self.pre_user)
         if len(self.post_user):
             post_user = ' (as %s)' % (self.post_user)
-        return "Pathname: %s\nOutputdir: %s\nTimeout: %d\nPre: %s%s\nPost: " \
-               "%s%s\nUser: %s\n" % \
-               (self.pathname, self.outputdir, self.timeout, self.pre,
-                pre_user, self.post, post_user, self.user)
+        return '''\
+Pathname: %s
+Identifier: %s
+Outputdir: %s
+Timeout: %d
+User: %s
+Pre: %s%s
+Post: %s%s
+Tags: %s
+''' % (self.pathname, self.identifier, self.outputdir, self.timeout, self.user,
+            self.pre, pre_user, self.post, post_user, self.tags)
 
     def verify(self, logger):
         """
@@ -392,13 +412,14 @@ class Test(Cmd):
         doesn't pass, skip this Test. Run the post script regardless.
         """
         odir = os.path.join(self.outputdir, os.path.basename(self.pre))
-        pretest = Cmd(self.pre, outputdir=odir, timeout=self.timeout,
-                      user=self.pre_user)
-        test = Cmd(self.pathname, outputdir=self.outputdir,
-                   timeout=self.timeout, user=self.user)
+        pretest = Cmd(self.pre, identifier=self.identifier, outputdir=odir,
+                      timeout=self.timeout, user=self.pre_user)
+        test = Cmd(self.pathname, identifier=self.identifier,
+                   outputdir=self.outputdir, timeout=self.timeout,
+                   user=self.user)
         odir = os.path.join(self.outputdir, os.path.basename(self.post))
-        posttest = Cmd(self.post, outputdir=odir, timeout=self.timeout,
-                       user=self.post_user)
+        posttest = Cmd(self.post, identifier=self.identifier, outputdir=odir,
+                       timeout=self.timeout, user=self.post_user)
 
         cont = True
         if len(pretest.pathname):
@@ -421,11 +442,8 @@ class Test(Cmd):
 class TestGroup(Test):
     props = Test.props + ['tests']
 
-    def __init__(self, pathname, outputdir=None, timeout=None, user=None,
-                 pre=None, pre_user=None, post=None, post_user=None,
-                 tests=None):
-        super(TestGroup, self).__init__(pathname, outputdir, timeout, user,
-                                        pre, pre_user, post, post_user)
+    def __init__(self, pathname, tests=None, **kwargs):
+        super(TestGroup, self).__init__(pathname, **kwargs)
         self.tests = tests or []
 
     def __str__(self):
@@ -434,10 +452,19 @@ class TestGroup(Test):
             pre_user = ' (as %s)' % (self.pre_user)
         if len(self.post_user):
             post_user = ' (as %s)' % (self.post_user)
-        return "Pathname: %s\nOutputdir: %s\nTests: %s\nTimeout: %d\n" \
-               "Pre: %s%s\nPost: %s%s\nUser: %s\n" % \
-               (self.pathname, self.outputdir, self.tests, self.timeout,
-                self.pre, pre_user, self.post, post_user, self.user)
+        return '''\
+Pathname: %s
+Identifier: %s
+Outputdir: %s
+Tests: %s
+Timeout: %d
+User: %s
+Pre: %s%s
+Post: %s%s
+Tags: %s
+''' % (self.pathname, self.identifier, self.outputdir, self.tests,
+            self.timeout, self.user, self.pre, pre_user, self.post, post_user,
+            self.tags)
 
     def filter(self, keeplist):
         self.tests = [ x for x in self.tests if x in keeplist ]
@@ -489,12 +516,16 @@ class TestGroup(Test):
         doesn't pass, skip all the tests in this TestGroup. Run the post
         script regardless.
         """
+        # tags assigned to this test group also include the test names
+        if options.tags and not set(self.tags).intersection(set(options.tags)):
+            return
+
         odir = os.path.join(self.outputdir, os.path.basename(self.pre))
         pretest = Cmd(self.pre, outputdir=odir, timeout=self.timeout,
-                      user=self.pre_user)
+                      user=self.pre_user, identifier=self.identifier)
         odir = os.path.join(self.outputdir, os.path.basename(self.post))
         posttest = Cmd(self.post, outputdir=odir, timeout=self.timeout,
-                       user=self.post_user)
+                       user=self.post_user, identifier=self.identifier)
 
         cont = True
         if len(pretest.pathname):
@@ -505,7 +536,8 @@ class TestGroup(Test):
         for fname in self.tests:
             test = Cmd(os.path.join(self.pathname, fname),
                        outputdir=os.path.join(self.outputdir, fname),
-                       timeout=self.timeout, user=self.user)
+                       timeout=self.timeout, user=self.user,
+                       identifier=self.identifier)
             if cont:
                 test.run(options)
             else:
@@ -536,7 +568,8 @@ class TestRun(object):
             ('pre', ''),
             ('pre_user', ''),
             ('post', ''),
-            ('post_user', '')
+            ('post_user', ''),
+            ('tags', [])
         ]
 
     def __str__(self):
@@ -611,25 +644,46 @@ class TestRun(object):
         verification, add it to the TestRun.
         """
         config = configparser.RawConfigParser()
-        if not len(config.read(options.runfile)):
-            fail("Couldn't read config file %s" % options.runfile)
+        parsed = config.read(options.runfiles)
+        failed = options.runfiles - set(parsed)
+        if len(failed):
+            files = ' '.join(sorted(failed))
+            fail("Couldn't read config files: %s" % files)
 
         for opt in TestRun.props:
             if config.has_option('DEFAULT', opt):
                 setattr(self, opt, config.get('DEFAULT', opt))
         self.outputdir = os.path.join(self.outputdir, self.timestamp)
 
+        testdir = options.testdir
+
         for section in config.sections():
             if ('arch' in config.options(section) and
                 platform.machine() != config.get(section, 'arch')):
                 continue
 
+            parts = section.split(':', 1)
+            sectiondir = parts[0]
+            identifier = parts[1] if len(parts) == 2 else None
+            if os.path.isdir(sectiondir):
+                pathname = sectiondir
+            elif os.path.isdir(os.path.join(testdir, sectiondir)):
+                pathname = os.path.join(testdir, sectiondir)
+            else:
+                pathname = sectiondir
+
+            testgroup = TestGroup(os.path.abspath(pathname),
+                                  identifier=identifier)
             if 'tests' in config.options(section):
-                testgroup = TestGroup(section)
                 for prop in TestGroup.props:
                     for sect in ['DEFAULT', section]:
                         if config.has_option(sect, prop):
-                            setattr(testgroup, prop, config.get(sect, prop))
+                            if prop == 'tags':
+                                setattr(testgroup, prop,
+                                        eval(config.get(sect, prop)))
+                            else:
+                                setattr(testgroup, prop,
+                                        config.get(sect, prop))
 
                 # Repopulate tests using eval to convert the string to a list
                 testgroup.tests = eval(config.get(section, 'tests'))
@@ -638,20 +692,18 @@ class TestRun(object):
                     self.testgroups[section] = testgroup
 
             elif 'autotests' in config.options(section):
-                testgroup = TestGroup(section)
                 for prop in TestGroup.props:
                     for sect in ['DEFAULT', section]:
                         if config.has_option(sect, prop):
                             setattr(testgroup, prop, config.get(sect, prop))
 
-                filenames = os.listdir(section)
+                filenames = os.listdir(pathname)
                 # only files starting with "tst." are considered tests
                 filenames = [f for f in filenames if f.startswith("tst.")]
                 testgroup.tests = sorted(filenames)
 
                 if testgroup.verify(logger):
                     self.testgroups[section] = testgroup
-
             else:
                 test = Test(section)
                 for prop in Test.props:
@@ -886,11 +938,17 @@ def fail(retstr, ret=1):
 
 
 def options_cb(option, opt_str, value, parser):
-    path_options = ['runfile', 'outputdir', 'template', 'logfile']
+    path_options = ['outputdir', 'template', 'testdir', 'logfile']
 
     if opt_str in parser.rargs:
         fail('%s may only be specified once.' % opt_str)
 
+    if option.dest == 'runfiles':
+        parser.values.cmd = 'rdconfig'
+        value = set(os.path.abspath(p) for p in value.split(','))
+    if option.dest == 'tags':
+        value = [x.strip() for x in value.split(',')]
+
     if option.dest in path_options:
         setattr(parser.values, option.dest, os.path.abspath(value))
     else:
@@ -900,8 +958,8 @@ def options_cb(option, opt_str, value, parser):
 def parse_args():
     parser = OptionParser()
     parser.add_option('-c', action='callback', callback=options_cb,
-                      type='string', dest='runfile', metavar='runfile',
-                      help='Specify tests to run via config file.')
+                      type='string', dest='runfiles', metavar='runfiles',
+                      help='Specify tests to run via config files.')
     parser.add_option('-d', action='store_true', default=False, dest='dryrun',
                       help='Dry run. Print tests, but take no other action.')
     parser.add_option('-l', action='callback', callback=options_cb,
@@ -913,6 +971,9 @@ def parse_args():
     parser.add_option('-o', action='callback', callback=options_cb,
                       default=BASEDIR, dest='outputdir', type='string',
                       metavar='outputdir', help='Specify an output directory.')
+    parser.add_option('-i', action='callback', callback=options_cb,
+                      default=TESTDIR, dest='testdir', type='string',
+                      metavar='testdir', help='Specify a test directory.')
     parser.add_option('-p', action='callback', callback=options_cb,
                       default='', dest='pre', metavar='script',
                       type='string', help='Specify a pre script.')
@@ -936,9 +997,12 @@ def parse_args():
     parser.add_option('-X', action='callback', callback=options_cb, default='',
                       dest='post_user', metavar='post_user', type='string',
                       help='Specify a user to execute the post script.')
+    parser.add_option('-T', action='callback', callback=options_cb, default='',
+                      dest='tags', metavar='tags', type='string',
+                      help='Specify tags to execute specific test groups.')
     (options, pathnames) = parser.parse_args()
 
-    if options.runfile and len(pathnames):
+    if options.runfiles and len(pathnames):
         fail('Extraneous arguments.')
 
     options.pathnames = [os.path.abspath(path) for path in pathnames]
@@ -951,7 +1015,7 @@ def main():
 
     testrun = TestRun(options)
 
-    if options.runfile:
+    if options.runfiles:
         testrun.read(testrun.logger, options)
     else:
         find_tests(testrun, options)
diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
index 724c9c788d..93325a63c0 100644
--- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
+++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
@@ -21,6 +21,7 @@
 export PATH="/usr/bin"
 export NOINUSE_CHECK=1
 export STF_SUITE="/opt/zfs-tests"
+export COMMON="$STF_SUITE/runfiles/common.run"
 export STF_TOOLS="/opt/test-runner/stf"
 export PATHDIR=""
 runner="/opt/test-runner/bin/run"
@@ -73,7 +74,7 @@ function find_runfile
 		distro=omnios
 	fi
 
-	[[ -n $distro ]] && echo $STF_SUITE/runfiles/$distro.run
+	[[ -n $distro ]] && echo $COMMON,$STF_SUITE/runfiles/$distro.run
 }
 
 function verify_id
@@ -133,14 +134,14 @@ constrain_path
 export PATH=$PATHDIR
 
 verify_id
-while getopts ac:l:q c; do
+while getopts ac:l:qT: c; do
 	case $c in
 	'a')
 		auto_detect=true
 		;;
 	'c')
-		runfile=$OPTARG
-		[[ -f $runfile ]] || fail "Cannot read file: $runfile"
+		runfiles=$OPTARG
+		[[ -f $runfiles ]] || fail "Cannot read file: $runfiles"
 		;;
 	'l')
 		logfile=$OPTARG
@@ -150,6 +151,9 @@ while getopts ac:l:q c; do
 	'q')
 		xargs+=" -q"
 		;;
+	'T')
+		xargs+=" -T $OPTARG"
+		;;
 	esac
 done
 shift $((OPTIND - 1))
@@ -174,8 +178,8 @@ fi
 export __ZFS_POOL_EXCLUDE="$KEEP"
 export KEEP="^$(echo $KEEP | sed 's/ /$|^/g')\$"
 
-[[ -z $runfile ]] && runfile=$(find_runfile)
-[[ -z $runfile ]] && fail "Couldn't determine distro"
+[[ -z $runfiles ]] && runfiles=$(find_runfile)
+[[ -z $runfiles ]] && fail "Couldn't determine distro"
 
 . $STF_SUITE/include/default.cfg
 
@@ -183,7 +187,7 @@ num_disks=$(echo $DISKS | awk '{print NF}')
 [[ $num_disks -lt 3 ]] && fail "Not enough disks to run ZFS Test Suite"
 
 # Ensure user has only basic privileges.
-ppriv -s EIP=basic -e $runner -c $runfile $xargs
+ppriv -s EIP=basic -e $runner -c $runfiles $xargs
 ret=$?
 
 rm -rf $PATHDIR || fail "Couldn't remove $PATHDIR"
diff --git a/usr/src/test/zfs-tests/runfiles/delphix.run b/usr/src/test/zfs-tests/runfiles/common.run
index a4297b7c13..46e4d27491 100644
--- a/usr/src/test/zfs-tests/runfiles/delphix.run
+++ b/usr/src/test/zfs-tests/runfiles/common.run
@@ -10,9 +10,7 @@
 #
 
 #
-# Copyright (c) 2012, 2018 by Delphix. All rights reserved.
-# Copyright 2016, OmniTI Computer Consulting, Inc. All rights reserved.
-# Copyright 2019 Joyent, Inc.
+# Copyright 2022 RackTop Systems.
 #
 
 [DEFAULT]
@@ -24,12 +22,14 @@ timeout = 1800
 post_user = root
 post = cleanup
 outputdir = /var/tmp/test_results
+tags = ['functional']
 
-[/opt/zfs-tests/tests/functional/acl/cifs]
+[tests/functional/acl/cifs]
 tests = ['cifs_attr_001_pos', 'cifs_attr_002_pos', 'cifs_attr_003_pos',
     'cifs_attr_004_pos']
+tags = ['functional', 'acl', 'cifs']
 
-[/opt/zfs-tests/tests/functional/acl/nontrivial]
+[tests/functional/acl/nontrivial]
 tests = ['zfs_acl_chmod_001_neg', 'zfs_acl_chmod_002_pos',
     'zfs_acl_chmod_aclmode_001_pos', 'zfs_acl_chmod_compact_001_pos',
     'zfs_acl_chmod_delete_001_pos', 'zfs_acl_chmod_inherit_001_pos',
@@ -43,8 +43,9 @@ tests = ['zfs_acl_chmod_001_neg', 'zfs_acl_chmod_002_pos',
     'zfs_acl_cpio_002_pos', 'zfs_acl_find_001_pos', 'zfs_acl_ls_001_pos',
     'zfs_acl_mv_001_pos', 'zfs_acl_tar_001_pos', 'zfs_acl_tar_002_pos',
     'zfs_acl_aclmode_restricted_001_neg']
+tags = ['functional', 'acl', 'nontrivial']
 
-[/opt/zfs-tests/tests/functional/acl/trivial]
+[tests/functional/acl/trivial]
 tests = ['zfs_acl_chmod_001_pos', 'zfs_acl_compress_001_pos',
     'zfs_acl_cp_001_pos', 'zfs_acl_cp_002_neg', 'zfs_acl_cp_003_neg',
     'zfs_acl_find_001_pos', 'zfs_acl_find_002_neg', 'zfs_acl_ls_001_pos',
@@ -53,8 +54,9 @@ tests = ['zfs_acl_chmod_001_pos', 'zfs_acl_compress_001_pos',
     'zfs_acl_pax_004_pos', 'zfs_acl_pax_005_pos', 'zfs_acl_pax_006_pos',
     'zfs_acl_tar_001_pos', 'zfs_acl_tar_002_neg',
     'zfs_acl_aclmode_restricted_001_pos']
+tags = ['functional', 'acl', 'trivial']
 
-[/opt/zfs-tests/tests/functional/alloc_class]
+[tests/functional/alloc_class]
 tests = ['alloc_class_001_pos', 'alloc_class_002_neg', 'alloc_class_003_pos',
     'alloc_class_004_pos', 'alloc_class_005_pos', 'alloc_class_006_pos',
     'alloc_class_007_pos', 'alloc_class_008_pos', 'alloc_class_009_pos',
@@ -62,26 +64,30 @@ tests = ['alloc_class_001_pos', 'alloc_class_002_neg', 'alloc_class_003_pos',
     'alloc_class_013_pos']
 tags = ['functional', 'alloc_class']
 
-[/opt/zfs-tests/tests/functional/atime]
+[tests/functional/atime]
 tests = ['atime_001_pos', 'atime_002_neg']
+tags = ['functional', 'atime']
 
-[/opt/zfs-tests/tests/functional/bootfs]
+[tests/functional/bootfs]
 tests = ['bootfs_001_pos', 'bootfs_002_neg', 'bootfs_003_pos',
     'bootfs_004_neg', 'bootfs_005_neg', 'bootfs_006_pos', 'bootfs_007_pos',
     'bootfs_008_pos']
+tags = ['functional', 'bootfs']
 
-[/opt/zfs-tests/tests/functional/cache]
+[tests/functional/cache]
 tests = ['cache_001_pos', 'cache_002_pos', 'cache_003_pos', 'cache_004_neg',
     'cache_005_neg', 'cache_006_pos', 'cache_007_neg', 'cache_008_neg',
-    'cache_009_pos', 'cache_010_neg', 'cache_011_pos']
+    'cache_009_pos', 'cache_010_neg', 'cache_011_pos', 'cache_012_pos']
+tags = ['functional', 'cache']
 
-[/opt/zfs-tests/tests/functional/cachefile]
+[tests/functional/cachefile]
 tests = ['cachefile_001_pos', 'cachefile_002_pos', 'cachefile_003_pos',
     'cachefile_004_pos']
+tags = ['functional', 'cachefile']
 pre =
 post =
 
-[/opt/zfs-tests/tests/functional/casenorm]
+[tests/functional/casenorm]
 tests = ['case_all_values', 'norm_all_values',
     'sensitive_none_lookup', 'sensitive_none_delete',
     'sensitive_formd_lookup', 'sensitive_formd_delete',
@@ -89,98 +95,117 @@ tests = ['case_all_values', 'norm_all_values',
     'insensitive_formd_lookup', 'insensitive_formd_delete',
     'mixed_none_lookup', 'mixed_none_lookup_ci', 'mixed_none_delete',
     'mixed_formd_lookup', 'mixed_formd_lookup_ci', 'mixed_formd_delete']
+tags = ['functional', 'casenorm']
 
-[/opt/zfs-tests/tests/functional/channel_program/lua_core]
+[tests/functional/channel_program/lua_core]
+tags = ['functional', 'channel_program', 'lua_core']
 autotests = 1
 
-[/opt/zfs-tests/tests/functional/channel_program/synctask_core]
+[tests/functional/channel_program/synctask_core]
+tags = ['functional', 'channel_program', 'synctask_core']
 autotests = 1
 
-[/opt/zfs-tests/tests/functional/checksum]
+[tests/functional/checksum]
 tests = ['run_edonr_test', 'run_sha2_test', 'run_skein_test']
+tags = ['functional', 'checksum']
 pre =
 post =
 
-[/opt/zfs-tests/tests/functional/clean_mirror]
+[tests/functional/clean_mirror]
 tests = [ 'clean_mirror_001_pos', 'clean_mirror_002_pos',
     'clean_mirror_003_pos', 'clean_mirror_004_pos']
+tags = ['functional', 'clean_mirror']
 
-[/opt/zfs-tests/tests/functional/cli_root/zdb]
-tests = ['zdb_001_neg', 'zdb_002_pos']
+[tests/functional/cli_root/zdb]
+tests = ['zdb_001_neg', 'zdb_002_pos', 'zdb_003_pos', 'zdb_004_pos',
+    'zdb_005_pos']
+tags = ['functional', 'cli_root', 'zdb']
 pre =
 post =
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs]
+[tests/functional/cli_root/zfs]
 tests = ['zfs_001_neg', 'zfs_002_pos', 'zfs_003_neg']
+tags = ['functional', 'cli_root', 'zfs']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_change-key]
+[tests/functional/cli_root/zfs_change-key]
 tests = ['zfs_change-key', 'zfs_change-key_child', 'zfs_change-key_format',
     'zfs_change-key_inherit', 'zfs_change-key_load', 'zfs_change-key_location',
     'zfs_change-key_pbkdf2iters', 'zfs_change-key_clones']
+tags = ['functional', 'cli_root', 'zfs_change-key']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_clone]
+[tests/functional/cli_root/zfs_clone]
 tests = ['zfs_clone_001_neg', 'zfs_clone_002_pos', 'zfs_clone_003_pos',
     'zfs_clone_004_pos', 'zfs_clone_005_pos', 'zfs_clone_006_pos',
     'zfs_clone_007_pos', 'zfs_clone_008_neg', 'zfs_clone_009_neg',
     'zfs_clone_010_pos', 'zfs_clone_encrypted']
+tags = ['functional', 'cli_root', 'zfs_clone']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_copies]
+[tests/functional/cli_root/zfs_copies]
 tests = ['zfs_copies_001_pos', 'zfs_copies_002_pos', 'zfs_copies_003_pos',
     'zfs_copies_004_neg', 'zfs_copies_005_neg', 'zfs_copies_006_pos']
+tags = ['functional', 'cli_root', 'zfs_copies']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_create]
+[tests/functional/cli_root/zfs_create]
 tests = ['zfs_create_001_pos', 'zfs_create_002_pos', 'zfs_create_003_pos',
     'zfs_create_004_pos', 'zfs_create_005_pos', 'zfs_create_006_pos',
     'zfs_create_007_pos', 'zfs_create_008_neg', 'zfs_create_009_neg',
     'zfs_create_010_neg', 'zfs_create_011_pos', 'zfs_create_012_pos',
-    'zfs_create_013_pos', 'zfs_create_encrypted',
-    'zfs_create_crypt_combos']
+    'zfs_create_013_pos', 'zfs_create_encrypted', 'zfs_create_crypt_combos']
+tags = ['functional', 'cli_root', 'zfs_create']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_destroy]
+[tests/functional/cli_root/zfs_destroy]
 tests = ['zfs_destroy_001_pos', 'zfs_destroy_002_pos', 'zfs_destroy_003_pos',
     'zfs_destroy_004_pos', 'zfs_destroy_005_neg', 'zfs_destroy_006_neg',
     'zfs_destroy_007_neg', 'zfs_destroy_008_pos', 'zfs_destroy_009_pos',
     'zfs_destroy_010_pos', 'zfs_destroy_011_pos', 'zfs_destroy_012_pos',
     'zfs_destroy_013_neg', 'zfs_destroy_014_pos', 'zfs_destroy_015_pos',
     'zfs_destroy_016_pos']
+tags = ['functional', 'cli_root', 'zfs_destroy']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_diff]
+[tests/functional/cli_root/zfs_diff]
 tests = ['zfs_diff_changes', 'zfs_diff_cliargs', 'zfs_diff_timestamp',
     'zfs_diff_types', 'zfs_diff_encrypted']
 tags = ['functional', 'cli_root', 'zfs_diff']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_get]
+[tests/functional/cli_root/zfs_get]
 tests = ['zfs_get_001_pos', 'zfs_get_002_pos', 'zfs_get_003_pos',
     'zfs_get_004_pos', 'zfs_get_005_neg', 'zfs_get_006_neg', 'zfs_get_007_neg',
     'zfs_get_008_pos', 'zfs_get_009_pos', 'zfs_get_010_neg']
+tags = ['functional', 'cli_root', 'zfs_get']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_inherit]
+[tests/functional/cli_root/zfs_inherit]
 tests = ['zfs_inherit_001_neg', 'zfs_inherit_002_neg', 'zfs_inherit_003_pos']
+tags = ['functional', 'cli_root', 'zfs_inherit']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_load-key]
+[tests/functional/cli_root/zfs_load-key]
 tests = ['zfs_load-key', 'zfs_load-key_all', 'zfs_load-key_file',
     'zfs_load-key_location', 'zfs_load-key_noop', 'zfs_load-key_recursive']
+tags = ['functional', 'cli_root', 'zfs_load-key']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_mount]
+[tests/functional/cli_root/zfs_mount]
 tests = ['zfs_mount_001_pos', 'zfs_mount_002_pos', 'zfs_mount_003_pos',
     'zfs_mount_004_pos', 'zfs_mount_005_pos', 'zfs_mount_006_pos',
     'zfs_mount_007_pos', 'zfs_mount_008_pos', 'zfs_mount_009_neg',
     'zfs_mount_010_neg', 'zfs_mount_011_neg', 'zfs_mount_012_neg',
     'zfs_mount_all_001_pos', 'zfs_mount_all_fail', 'zfs_mount_all_mountpoints',
     'zfs_mount_encrypted']
+tags = ['functional', 'cli_root', 'zfs_mount']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_program]
+[tests/functional/cli_root/zfs_program]
 tests = ['zfs_program_json']
+tags = ['functional', 'cli_root', 'zfs_program']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_promote]
+[tests/functional/cli_root/zfs_promote]
 tests = ['zfs_promote_001_pos', 'zfs_promote_002_pos', 'zfs_promote_003_pos',
     'zfs_promote_004_pos', 'zfs_promote_005_pos', 'zfs_promote_006_neg',
     'zfs_promote_007_neg', 'zfs_promote_008_pos', 'zfs_promote_encryptionroot']
+tags = ['functional', 'cli_root', 'zfs_promote']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_property]
+[tests/functional/cli_root/zfs_property]
 tests = ['zfs_written_property_001_pos']
+tags = ['functional', 'cli_root', 'zfs_property']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_receive]
+[tests/functional/cli_root/zfs_receive]
 tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos',
     'zfs_receive_005_neg', 'zfs_receive_006_pos',
     'zfs_receive_007_neg', 'zfs_receive_008_pos', 'zfs_receive_009_neg',
@@ -189,32 +214,42 @@ tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos',
     'receive-o-x_props_override', 'zfs_receive_from_encrypted',
     'zfs_receive_to_encrypted' 'zfs_receive_raw',
     'zfs_receive_raw_incremental']
+tags = ['functional', 'cli_root', 'zfs_receive']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_remap]
+[tests/functional/cli_root/zfs_remap]
 tests = ['zfs_remap_cliargs', 'zfs_remap_obsolete_counts']
+tags = ['functional', 'cli_root', 'zfs_remap']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_rename]
+[tests/functional/cli_root/zfs_rename]
 tests = ['zfs_rename_001_pos', 'zfs_rename_002_pos', 'zfs_rename_003_pos',
     'zfs_rename_004_neg', 'zfs_rename_005_neg', 'zfs_rename_006_pos',
     'zfs_rename_007_pos', 'zfs_rename_008_pos', 'zfs_rename_009_neg',
     'zfs_rename_010_neg', 'zfs_rename_011_pos', 'zfs_rename_012_neg',
     'zfs_rename_013_pos', 'zfs_rename_014_neg', 'zfs_rename_encrypted_child',
     'zfs_rename_to_encrypted']
+tags = ['functional', 'cli_root', 'zfs_rename']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_reservation]
+[tests/functional/cli_root/zfs_reservation]
 tests = ['zfs_reservation_001_pos', 'zfs_reservation_002_pos']
+tags = ['functional', 'cli_root', 'zfs_reservation']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_rollback]
+[tests/functional/resilver]
+tests = ['resilver_restart_001', 'resilver_restart_002']
+tags = ['functional', 'resilver']
+
+[tests/functional/cli_root/zfs_rollback]
 tests = ['zfs_rollback_001_pos', 'zfs_rollback_002_pos',
     'zfs_rollback_003_neg', 'zfs_rollback_004_neg']
+tags = ['functional', 'cli_root', 'zfs_rollback']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_send]
+[tests/functional/cli_root/zfs_send]
 tests = ['zfs_send_001_pos', 'zfs_send_002_pos', 'zfs_send_003_pos',
     'zfs_send_004_neg', 'zfs_send_005_pos', 'zfs_send_006_pos',
     'zfs_send_007_pos', 'zfs_send_encrypted', 'zfs_send_raw',
     'zfs_send-b']
+tags = ['functional', 'cli_root', 'zfs_send']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_set]
+[tests/functional/cli_root/zfs_set]
 tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
     'canmount_002_pos', 'canmount_003_pos', 'canmount_004_pos',
     'checksum_001_pos', 'compression_001_pos', 'mountpoint_001_pos',
@@ -224,55 +259,66 @@ tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
     'user_property_001_pos', 'user_property_002_pos', 'user_property_003_neg',
     'user_property_004_pos', 'version_001_neg', 'zfs_set_001_neg',
     'zfs_set_002_neg', 'zfs_set_003_neg', 'zfs_set_keylocation']
+tags = ['functional', 'cli_root', 'zfs_set']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_share]
+[tests/functional/cli_root/zfs_share]
 tests = ['zfs_share_001_pos', 'zfs_share_002_pos', 'zfs_share_003_pos',
     'zfs_share_004_pos', 'zfs_share_005_pos', 'zfs_share_006_pos',
     'zfs_share_007_neg', 'zfs_share_008_neg', 'zfs_share_009_neg',
     'zfs_share_010_neg', 'zfs_share_011_pos']
+tags = ['functional', 'cli_root', 'zfs_share']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_snapshot]
+[tests/functional/cli_root/zfs_snapshot]
 tests = ['zfs_snapshot_001_neg', 'zfs_snapshot_002_neg',
     'zfs_snapshot_003_neg', 'zfs_snapshot_004_neg', 'zfs_snapshot_005_neg',
     'zfs_snapshot_006_pos', 'zfs_snapshot_007_neg', 'zfs_snapshot_008_neg',
     'zfs_snapshot_009_pos']
+tags = ['functional', 'cli_root', 'zfs_snapshot']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unload-key]
+[tests/functional/cli_root/zfs_unload-key]
 tests = ['zfs_unload-key', 'zfs_unload-key_all', 'zfs_unload-key_recursive']
+tags = ['functional', 'cli_root', 'zfs_unload-key']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unmount]
+[tests/functional/cli_root/zfs_unmount]
 tests = ['zfs_unmount_001_pos', 'zfs_unmount_002_pos', 'zfs_unmount_003_pos',
     'zfs_unmount_004_pos', 'zfs_unmount_005_pos', 'zfs_unmount_006_pos',
     'zfs_unmount_007_neg', 'zfs_unmount_008_neg', 'zfs_unmount_009_pos',
     'zfs_unmount_all_001_pos']
+tags = ['functional', 'cli_root', 'zfs_unmount']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unshare]
+[tests/functional/cli_root/zfs_unshare]
 tests = ['zfs_unshare_001_pos', 'zfs_unshare_002_pos', 'zfs_unshare_003_pos',
     'zfs_unshare_004_neg', 'zfs_unshare_005_neg']
+tags = ['functional', 'cli_root', 'zfs_unshare']
 
-[/opt/zfs-tests/tests/functional/cli_root/zfs_upgrade]
+[tests/functional/cli_root/zfs_upgrade]
 tests = ['zfs_upgrade_001_pos', 'zfs_upgrade_002_pos', 'zfs_upgrade_003_pos',
     'zfs_upgrade_004_pos', 'zfs_upgrade_005_pos', 'zfs_upgrade_006_neg',
     'zfs_upgrade_007_neg']
+tags = ['functional', 'cli_root', 'zfs_upgrade']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool]
+[tests/functional/cli_root/zpool]
 tests = ['zpool_001_neg', 'zpool_002_pos', 'zpool_003_pos']
+tags = ['functional', 'cli_root', 'zpool']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_add]
+[tests/functional/cli_root/zpool_add]
 tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos',
     'zpool_add_004_pos', 'zpool_add_005_pos', 'zpool_add_006_pos',
     'zpool_add_007_neg', 'zpool_add_008_neg', 'zpool_add_009_neg',
     'zpool_add_010_pos',
     'add_nested_replacing_spare', 'add-o_ashift', 'add_prop_ashift']
+tags = ['functional', 'cli_root', 'zpool_add']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_attach]
+[tests/functional/cli_root/zpool_attach]
 tests = ['zpool_attach_001_neg', 'attach-o_ashift']
+tags = ['functional', 'cli_root', 'zpool_attach']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_clear]
+[tests/functional/cli_root/zpool_clear]
 tests = ['zpool_clear_001_pos', 'zpool_clear_002_neg', 'zpool_clear_003_neg',
     'zpool_clear_readonly']
+tags = ['functional', 'cli_root', 'zpool_clear']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_create]
+[tests/functional/cli_root/zpool_create]
 tests = ['zpool_create_001_pos', 'zpool_create_002_pos',
     'zpool_create_003_pos', 'zpool_create_004_pos', 'zpool_create_005_pos',
     'zpool_create_006_pos', 'zpool_create_007_neg', 'zpool_create_008_pos',
@@ -285,33 +331,40 @@ tests = ['zpool_create_001_pos', 'zpool_create_002_pos',
     'zpool_create_encrypted', 'zpool_create_crypt_combos',
     'zpool_create_features_001_pos', 'zpool_create_features_002_pos',
     'zpool_create_features_003_pos', 'zpool_create_features_004_neg',
-    'zpool_create_tempname', 'create-o_ashift']
+    'zpool_create_features_005_pos', 'zpool_create_tempname', 'create-o_ashift']
+tags = ['functional', 'cli_root', 'zpool_create']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_destroy]
+[tests/functional/cli_root/zpool_destroy]
 tests = ['zpool_destroy_001_pos', 'zpool_destroy_002_pos',
     'zpool_destroy_003_neg']
+tags = ['functional', 'cli_root', 'zpool_destroy']
 pre =
 post =
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_detach]
+[tests/functional/cli_root/zpool_detach]
 tests = ['zpool_detach_001_neg']
+tags = ['functional', 'cli_root', 'zpool_detach']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_expand]
+[tests/functional/cli_root/zpool_expand]
 tests = ['zpool_expand_001_pos', 'zpool_expand_002_pos',
     'zpool_expand_003_neg']
+tags = ['functional', 'cli_root', 'zpool_expand']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_export]
+[tests/functional/cli_root/zpool_export]
 tests = ['zpool_export_001_pos', 'zpool_export_002_pos',
     'zpool_export_003_neg', 'zpool_export_004_pos']
+tags = ['functional', 'cli_root', 'zpool_export']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_get]
+[tests/functional/cli_root/zpool_get]
 tests = ['zpool_get_001_pos', 'zpool_get_002_pos', 'zpool_get_003_pos',
     'zpool_get_004_neg']
+tags = ['functional', 'cli_root', 'zpool_get']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_history]
+[tests/functional/cli_root/zpool_history]
 tests = ['zpool_history_001_neg', 'zpool_history_002_pos']
+tags = ['functional', 'cli_root', 'zpool_history']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_import]
+[tests/functional/cli_root/zpool_import]
 tests = ['zpool_import_001_pos', 'zpool_import_002_pos',
     'zpool_import_003_pos', 'zpool_import_004_pos', 'zpool_import_005_pos',
     'zpool_import_006_pos', 'zpool_import_007_pos', 'zpool_import_008_pos',
@@ -328,17 +381,20 @@ tests = ['zpool_import_001_pos', 'zpool_import_002_pos',
     'import_cachefile_mirror_detached',
     'import_cachefile_device_replaced',
     'import_rewind_config_changed',
-    'import_rewind_device_replaced',
     'import_cachefile_shared_device',
     'import_paths_changed',
     'import_devices_missing',
     'zpool_import_encrypted', 'zpool_import_encrypted_load']
+tags = ['functional', 'cli_root', 'zpool_import']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_labelclear]
-tests = ['zpool_labelclear_active', 'zpool_labelclear_exported']
+[tests/functional/cli_root/zpool_labelclear]
+tests = ['zpool_labelclear_active', 'zpool_labelclear_exported',
+    'zpool_labelclear_removed', 'zpool_labelclear_valid']
+tags = ['functional', 'cli_root', 'zpool_labelclear']
 pre =
 post =
-[/opt/zfs-tests/tests/functional/cli_root/zpool_initialize]
+
+[tests/functional/cli_root/zpool_initialize]
 tests = ['zpool_initialize_attach_detach_add_remove',
     'zpool_initialize_import_export',
     'zpool_initialize_offline_export_import_online',
@@ -350,49 +406,54 @@ tests = ['zpool_initialize_attach_detach_add_remove',
     'zpool_initialize_unsupported_vdevs',
     'zpool_initialize_verify_checksums',
     'zpool_initialize_verify_initialized']
+tags = ['functional', 'cli_root', 'zpool_initialize']
 pre =
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_offline]
+[tests/functional/cli_root/zpool_offline]
 tests = ['zpool_offline_001_pos', 'zpool_offline_002_neg']
+tags = ['functional', 'cli_root', 'zpool_offline']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_online]
+[tests/functional/cli_root/zpool_online]
 tests = ['zpool_online_001_pos', 'zpool_online_002_neg']
+tags = ['functional', 'cli_root', 'zpool_online']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_remove]
+[tests/functional/cli_root/zpool_remove]
 tests = ['zpool_remove_001_neg', 'zpool_remove_002_pos',
     'zpool_remove_003_pos']
+tags = ['functional', 'cli_root', 'zpool_remove']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_replace]
+[tests/functional/cli_root/zpool_replace]
 tests = ['zpool_replace_001_neg', 'zpool_replace_002_neg', 'replace-o_ashift',
     'replace_prop_ashift']
+tags = ['functional', 'cli_root', 'zpool_replace']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_resilver]
+[tests/functional/cli_root/zpool_resilver]
 tests = ['zpool_resilver_bad_args', 'zpool_resilver_restart']
 tags = ['functional', 'cli_root', 'zpool_resilver']
 
-[/opt/zfs-tests/tests/functional/resilver]
-tests = ['resilver_restart_001']
-tags = ['functional', 'resilver']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_scrub]
+[tests/functional/cli_root/zpool_scrub]
 tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos',
     'zpool_scrub_004_pos', 'zpool_scrub_005_pos', 'zpool_scrub_print_repairing',
     'zpool_scrub_offline_device', 'zpool_scrub_multiple_copies',
     'zpool_scrub_encrypted_unloaded']
+tags = ['functional', 'cli_root', 'zpool_scrub']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_set]
+[tests/functional/cli_root/zpool_set]
 tests = ['zpool_set_001_pos', 'zpool_set_002_neg', 'zpool_set_003_neg',
     'zpool_set_ashift']
+tags = ['functional', 'cli_root', 'zpool_set']
 pre =
 post =
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_status]
+[tests/functional/cli_root/zpool_status]
 tests = ['zpool_status_001_pos', 'zpool_status_002_pos']
+tags = ['functional', 'cli_root', 'zpool_status']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_sync]
+[tests/functional/cli_root/zpool_sync]
 tests = ['zpool_sync_001_pos', 'zpool_sync_002_neg']
+tags = ['functional', 'cli_root', 'zpool_sync']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_trim]
+[tests/functional/cli_root/zpool_trim]
 tests = ['zpool_trim_attach_detach_add_remove',
     'zpool_trim_import_export', 'zpool_trim_multiple', 'zpool_trim_neg',
     'zpool_trim_offline_export_import_online', 'zpool_trim_online_offline',
@@ -401,15 +462,16 @@ tests = ['zpool_trim_attach_detach_add_remove',
     'zpool_trim_start_and_cancel_pos', 'zpool_trim_suspend_resume',
     'zpool_trim_unsupported_vdevs', 'zpool_trim_verify_checksums',
     'zpool_trim_verify_trimmed']
-tags = ['functional', 'zpool_trim']
+tags = ['functional', 'cli_root', 'zpool_trim']
 
-[/opt/zfs-tests/tests/functional/cli_root/zpool_upgrade]
+[tests/functional/cli_root/zpool_upgrade]
 tests = ['zpool_upgrade_001_pos', 'zpool_upgrade_002_pos',
     'zpool_upgrade_003_pos', 'zpool_upgrade_004_pos', 'zpool_upgrade_005_neg',
     'zpool_upgrade_006_neg', 'zpool_upgrade_007_pos', 'zpool_upgrade_008_pos',
     'zpool_upgrade_009_neg']
+tags = ['functional', 'cli_root', 'zpool_upgrade']
 
-[/opt/zfs-tests/tests/functional/cli_user/misc]
+[tests/functional/cli_user/misc]
 tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
     'zfs_clone_001_neg', 'zfs_create_001_neg', 'zfs_destroy_001_neg',
     'zfs_get_001_neg', 'zfs_inherit_001_neg', 'zfs_mount_001_neg',
@@ -417,7 +479,6 @@ tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
     'zfs_rollback_001_neg', 'zfs_send_001_neg', 'zfs_set_001_neg',
     'zfs_share_001_neg', 'zfs_snapshot_001_neg', 'zfs_unallow_001_neg',
     'zfs_unmount_001_neg', 'zfs_unshare_001_neg', 'zfs_upgrade_001_neg',
-    'zfs_channel_001_neg',
     'zpool_001_neg', 'zpool_add_001_neg', 'zpool_attach_001_neg',
     'zpool_clear_001_neg', 'zpool_create_001_neg', 'zpool_destroy_001_neg',
     'zpool_detach_001_neg', 'zpool_export_001_neg', 'zpool_get_001_neg',
@@ -425,131 +486,162 @@ tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
     'zpool_offline_001_neg', 'zpool_online_001_neg', 'zpool_remove_001_neg',
     'zpool_replace_001_neg', 'zpool_scrub_001_neg', 'zpool_set_001_neg',
     'zpool_status_001_neg', 'zpool_upgrade_001_neg']
+tags = ['functional', 'cli_user', 'misc']
 user =
 
-[/opt/zfs-tests/tests/functional/cli_user/zfs_list]
+[tests/functional/cli_user/zfs_list]
 tests = ['zfs_list_001_pos', 'zfs_list_002_pos', 'zfs_list_003_pos',
     'zfs_list_004_neg', 'zfs_list_007_pos', 'zfs_list_008_neg']
+tags = ['functional', 'cli_user', 'zfs_list']
 user =
 
-[/opt/zfs-tests/tests/functional/cli_user/zpool_iostat]
+[tests/functional/cli_user/zpool_iostat]
 tests = ['zpool_iostat_001_neg', 'zpool_iostat_002_pos',
     'zpool_iostat_003_neg', 'zpool_iostat_004_pos']
+tags = ['functional', 'cli_user', 'zpool_iostat']
 user =
 
-[/opt/zfs-tests/tests/functional/cli_user/zpool_list]
+[tests/functional/cli_user/zpool_list]
 tests = ['zpool_list_001_pos', 'zpool_list_002_neg']
+tags = ['functional', 'cli_user', 'zpool_list']
 user =
 
-[/opt/zfs-tests/tests/functional/compression]
+[tests/functional/compression]
 tests = ['compress_001_pos', 'compress_002_pos', 'compress_003_pos',
-    'compress_004_pos']
+    'compress_004_pos', 'l2arc_compressed_arc', 'l2arc_compressed_arc_disabled']
+tags = ['functional', 'compression']
 
-[/opt/zfs-tests/tests/functional/ctime]
+[tests/functional/ctime]
 tests = ['ctime_001_pos' ]
+tags = ['functional', 'ctime']
 
-[/opt/zfs-tests/tests/functional/delegate]
+[tests/functional/delegate]
 tests = ['zfs_allow_001_pos', 'zfs_allow_002_pos',
     'zfs_allow_004_pos', 'zfs_allow_005_pos', 'zfs_allow_006_pos',
     'zfs_allow_007_pos', 'zfs_allow_008_pos', 'zfs_allow_009_neg',
-    'zfs_allow_011_neg', 'zfs_allow_012_neg',
+    'zfs_allow_010_pos', 'zfs_allow_011_neg', 'zfs_allow_012_neg',
     'zfs_unallow_001_pos', 'zfs_unallow_002_pos', 'zfs_unallow_003_pos',
     'zfs_unallow_004_pos', 'zfs_unallow_005_pos', 'zfs_unallow_006_pos',
     'zfs_unallow_007_neg', 'zfs_unallow_008_neg']
+tags = ['functional', 'delegate']
 
-[/opt/zfs-tests/tests/functional/devices]
+[tests/functional/devices]
 tests = ['devices_001_pos', 'devices_002_neg', 'devices_003_pos']
+tags = ['functional', 'devices']
 
-[/opt/zfs-tests/tests/functional/exec]
+[tests/functional/exec]
 tests = ['exec_001_pos', 'exec_002_neg']
+tags = ['functional', 'exec']
 
-[/opt/zfs-tests/tests/functional/fault]
-tests = ['zpool_status_-s']
-
-[/opt/zfs-tests/tests/functional/features/async_destroy]
+[tests/functional/features/async_destroy]
 tests = ['async_destroy_001_pos']
+tags = ['functional', 'async_destroy']
 
-[/opt/zfs-tests/tests/functional/grow_pool]
+[tests/functional/fault]
+tests = ['zpool_status_-s']
+tags = ['functional', 'fault']
+
+[tests/functional/grow_pool]
 tests = ['grow_pool_001_pos']
+tags = ['functional', 'grow_pool']
 
-[/opt/zfs-tests/tests/functional/grow_replicas]
+[tests/functional/grow_replicas]
 tests = ['grow_replicas_001_pos']
+tags = ['functional', 'grow_replicas']
 pre =
 post =
 
-[/opt/zfs-tests/tests/functional/history]
+[tests/functional/history]
 tests = ['history_001_pos', 'history_002_pos', 'history_003_pos',
     'history_004_pos', 'history_005_neg', 'history_006_neg', 'history_007_pos',
     'history_008_pos', 'history_009_pos', 'history_010_pos']
+tags = ['functional', 'history']
 
-[/opt/zfs-tests/tests/functional/holes]
+[tests/functional/holes]
 tests = ['holes_sanity']
+tags = ['functional', 'holes']
 
-[/opt/zfs-tests/tests/functional/inheritance]
+[tests/functional/inheritance]
 tests = ['inherit_001_pos']
+tags = ['functional', 'inheritance']
 pre =
 
-[/opt/zfs-tests/tests/functional/inuse]
+[tests/functional/inuse]
 tests = ['inuse_001_pos', 'inuse_003_pos', 'inuse_004_pos',
     'inuse_005_pos', 'inuse_006_pos', 'inuse_007_pos', 'inuse_008_pos',
     'inuse_009_pos']
+tags = ['functional', 'inuse']
 post =
 
-[/opt/zfs-tests/tests/functional/large_dnode]
+[tests/functional/large_dnode]
 tests = ['large_dnode_001_pos', 'large_dnode_003_pos',
     'large_dnode_004_neg', 'large_dnode_005_pos', 'large_dnode_007_neg']
+tags = ['functional', 'large_dnode']
 
-[/opt/zfs-tests/tests/functional/large_files]
+[tests/functional/large_files]
 tests = ['large_files_001_pos']
+tags = ['functional', 'large_files']
 
-[/opt/zfs-tests/tests/functional/largest_pool]
+[tests/functional/largest_pool]
 tests = ['largest_pool_001_pos']
+tags = ['functional', 'largest_pool']
 pre =
 post =
 
-[/opt/zfs-tests/tests/functional/link_count]
+[tests/functional/link_count]
 tests = ['link_count_001']
+tags = ['functional', 'link_count']
 
-[/opt/zfs-tests/tests/functional/mdb]
+[tests/functional/mdb]
 tests = ['mdb_001_pos']
+tags = ['functional', 'mdb']
 
-[/opt/zfs-tests/tests/functional/migration]
+[tests/functional/migration]
 tests = ['migration_001_pos', 'migration_002_pos', 'migration_003_pos',
     'migration_004_pos', 'migration_005_pos', 'migration_006_pos',
     'migration_007_pos', 'migration_008_pos', 'migration_009_pos',
     'migration_010_pos', 'migration_011_pos', 'migration_012_pos']
+tags = ['functional', 'migration']
 
-[/opt/zfs-tests/tests/functional/mmap]
+[tests/functional/mmap]
 tests = ['mmap_read_001_pos', 'mmap_write_001_pos']
+tags = ['functional', 'mmap']
 
-[/opt/zfs-tests/tests/functional/mmp]
+[tests/functional/mmp]
 tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval',
     'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import',
     'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history',
     'mmp_on_zdb']
+tags = ['functional', 'mmp']
 
-[/opt/zfs-tests/tests/functional/mount]
+[tests/functional/mount]
 tests = ['umount_001', 'umount_002', 'umountall_001']
+tags = ['functional', 'mount']
 
-[/opt/zfs-tests/tests/functional/mv_files]
+[tests/functional/mv_files]
 tests = ['mv_files_001_pos', 'mv_files_002_pos']
+tags = ['functional', 'mv_files']
 
-[/opt/zfs-tests/tests/functional/nestedfs]
+[tests/functional/nestedfs]
 tests = ['nestedfs_001_pos']
+tags = ['functional', 'nestedfs']
 
-[/opt/zfs-tests/tests/functional/no_space]
+[tests/functional/no_space]
 tests = ['enospc_001_pos', 'enospc_002_pos']
+tags = ['functional', 'no_space']
 
-[/opt/zfs-tests/tests/functional/nopwrite]
+[tests/functional/nopwrite]
 tests = ['nopwrite_copies', 'nopwrite_mtime', 'nopwrite_negative',
     'nopwrite_promoted_clone', 'nopwrite_recsize', 'nopwrite_sync',
     'nopwrite_varying_compression', 'nopwrite_volume']
+tags = ['functional', 'nopwrite']
 
-[/opt/zfs-tests/tests/functional/online_offline]
+[tests/functional/online_offline]
 tests = ['online_offline_001_pos', 'online_offline_002_neg',
     'online_offline_003_neg']
+tags = ['functional', 'online_offline']
 
-[/opt/zfs-tests/tests/functional/pool_checkpoint]
+[tests/functional/pool_checkpoint]
 tests = ['checkpoint_after_rewind', 'checkpoint_big_rewind',
     'checkpoint_capacity', 'checkpoint_conf_change', 'checkpoint_discard',
     'checkpoint_discard_busy', 'checkpoint_discard_many',
@@ -557,19 +649,23 @@ tests = ['checkpoint_after_rewind', 'checkpoint_big_rewind',
     'checkpoint_open', 'checkpoint_removal', 'checkpoint_rewind',
     'checkpoint_ro_rewind', 'checkpoint_sm_scale', 'checkpoint_twice',
     'checkpoint_vdev_add', 'checkpoint_zdb', 'checkpoint_zhack_feat']
+tags = ['functional', 'pool_checkpoint']
 
-[/opt/zfs-tests/tests/functional/pool_names]
+[tests/functional/pool_names]
 tests = ['pool_names_001_pos', 'pool_names_002_neg']
+tags = ['functional', 'pool_names']
 pre =
 post =
 
-[/opt/zfs-tests/tests/functional/poolversion]
+[tests/functional/poolversion]
 tests = ['poolversion_001_pos', 'poolversion_002_pos']
+tags = ['functional', 'poolversion']
 
-[/opt/zfs-tests/tests/functional/privilege]
+[tests/functional/privilege]
 tests = ['privilege_001_pos', 'privilege_002_pos']
+tags = ['functional', 'privilege']
 
-[/opt/zfs-tests/tests/functional/projectquota]
+[tests/functional/projectquota]
 tests = ['projectid_001_pos', 'projectid_002_pos', 'projectid_003_pos',
     'projectquota_001_pos', 'projectquota_002_pos', 'projectquota_003_pos',
     'projectquota_004_neg', 'projectquota_005_pos', 'projectquota_006_pos',
@@ -577,28 +673,34 @@ tests = ['projectid_001_pos', 'projectid_002_pos', 'projectid_003_pos',
     'projectspace_001_pos', 'projectspace_002_pos', 'projectspace_003_pos',
     'projectspace_004_pos',
     'projecttree_002_pos', 'projecttree_003_neg' ]
+tags = ['functional', 'projectquota']
 
-[/opt/zfs-tests/tests/functional/quota]
+[tests/functional/quota]
 tests = ['quota_001_pos', 'quota_002_pos', 'quota_003_pos', 'quota_004_pos',
     'quota_005_pos', 'quota_006_neg']
+tags = ['functional', 'quota']
 
-[/opt/zfs-tests/tests/functional/raidz]
+[tests/functional/raidz]
 tests = ['raidz_001_neg', 'raidz_002_pos']
+tags = ['functional', 'raidz']
 
-[/opt/zfs-tests/tests/functional/redundancy]
+[tests/functional/redundancy]
 tests = ['redundancy_001_pos', 'redundancy_002_pos', 'redundancy_003_pos',
     'redundancy_004_neg']
+tags = ['functional', 'redundancy']
 
-[/opt/zfs-tests/tests/functional/refquota]
+[tests/functional/refquota]
 tests = ['refquota_001_pos', 'refquota_002_pos', 'refquota_003_pos',
     'refquota_004_pos', 'refquota_005_pos', 'refquota_006_neg']
+tags = ['functional', 'refquota']
 
-[/opt/zfs-tests/tests/functional/refreserv]
+[tests/functional/refreserv]
 tests = ['refreserv_001_pos', 'refreserv_002_pos', 'refreserv_003_pos',
     'refreserv_004_pos', 'refreserv_005_pos', 'refreserv_raidz',
     'refreserv_multi_raidz']
+tags = ['functional', 'refreserv']
 
-[/opt/zfs-tests/tests/functional/removal]
+[tests/functional/removal]
 pre =
 tests = ['removal_sanity', 'removal_all_vdev', 'removal_check_space',
     'removal_condense_export',
@@ -610,14 +712,17 @@ tests = ['removal_sanity', 'removal_all_vdev', 'removal_check_space',
     'removal_with_send_recv', 'removal_with_snapshot', 'removal_with_write',
     'removal_with_zdb', 'removal_resume_export',
     'remove_mirror', 'remove_mirror_sanity', 'remove_raidz']
+tags = ['functional', 'removal']
 
-[/opt/zfs-tests/tests/functional/rename_dirs]
+[tests/functional/rename_dirs]
 tests = ['rename_dirs_001_pos']
+tags = ['functional', 'rename_dirs']
 
-[/opt/zfs-tests/tests/functional/replacement]
+[tests/functional/replacement]
 tests = ['replacement_001_pos', 'replacement_002_pos']
+tags = ['functional', 'replacement']
 
-[/opt/zfs-tests/tests/functional/reservation]
+[tests/functional/reservation]
 tests = ['reservation_001_pos', 'reservation_002_pos', 'reservation_003_pos',
     'reservation_004_pos', 'reservation_005_pos', 'reservation_006_pos',
     'reservation_007_pos', 'reservation_008_pos', 'reservation_009_pos',
@@ -626,11 +731,13 @@ tests = ['reservation_001_pos', 'reservation_002_pos', 'reservation_003_pos',
     'reservation_016_pos', 'reservation_017_pos', 'reservation_018_pos',
     'reservation_019_pos', 'reservation_020_pos', 'reservation_021_neg',
     'reservation_022_pos']
+tags = ['functional', 'reservation']
 
-[/opt/zfs-tests/tests/functional/rootpool]
+[tests/functional/rootpool]
 tests = ['rootpool_002_neg', 'rootpool_003_neg', 'rootpool_007_pos']
+tags = ['functional', 'rootpool']
 
-[/opt/zfs-tests/tests/functional/rsend]
+[tests/functional/rsend]
 tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos',
     'rsend_005_pos', 'rsend_006_pos', 'rsend_007_pos', 'rsend_008_pos',
     'rsend_009_pos', 'rsend_010_pos', 'rsend_011_pos', 'rsend_012_pos',
@@ -648,18 +755,21 @@ tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos',
     'send_realloc_files',
     'send_realloc_encrypted_files', 'send_holds',
     'send_mixed_raw', 'send-wDR_encrypted_zvol']
+tags = ['functional', 'rsend']
 
-[/opt/zfs-tests/tests/functional/scrub_mirror]
+[tests/functional/scrub_mirror]
 tests = ['scrub_mirror_001_pos', 'scrub_mirror_002_pos',
     'scrub_mirror_003_pos', 'scrub_mirror_004_pos']
+tags = ['functional', 'scrub_mirror']
 
-[/opt/zfs-tests/tests/functional/slog]
+[tests/functional/slog]
 tests = ['slog_001_pos', 'slog_002_pos', 'slog_003_pos', 'slog_004_pos',
     'slog_005_pos', 'slog_006_pos', 'slog_007_pos', 'slog_008_neg',
     'slog_009_neg', 'slog_010_neg', 'slog_011_neg', 'slog_012_neg',
     'slog_013_pos', 'slog_014_pos', 'slog_replay_fs_001', 'slog_replay_fs_002']
+tags = ['functional', 'slog']
 
-[/opt/zfs-tests/tests/functional/snapshot]
+[tests/functional/snapshot]
 tests = ['clone_001_pos', 'rollback_001_pos', 'rollback_002_pos',
     'rollback_003_pos', 'snapshot_001_pos', 'snapshot_002_pos',
     'snapshot_003_pos', 'snapshot_004_pos', 'snapshot_005_pos',
@@ -668,30 +778,36 @@ tests = ['clone_001_pos', 'rollback_001_pos', 'rollback_002_pos',
     'snapshot_012_pos', 'snapshot_013_pos', 'snapshot_014_pos',
     'snapshot_015_pos', 'snapshot_016_pos', 'snapshot_017_pos',
     'deadlist_lock']
+tags = ['functional', 'snapshot']
 
-[/opt/zfs-tests/tests/functional/snapused]
+[tests/functional/snapused]
 tests = ['snapused_001_pos', 'snapused_002_pos', 'snapused_003_pos',
     'snapused_004_pos', 'snapused_005_pos']
+tags = ['functional', 'snapused']
 
-[/opt/zfs-tests/tests/functional/sparse]
+[tests/functional/sparse]
 tests = ['sparse_001_pos']
+tags = ['functional', 'sparse']
 
-[/opt/zfs-tests/tests/functional/threadsappend]
+[tests/functional/threadsappend]
 tests = ['threadsappend_001_pos']
+tags = ['functional', 'threadsappend']
 
-[/opt/zfs-tests/tests/functional/trim]
+[tests/functional/trim]
 tests = ['autotrim_integrity', 'autotrim_config', 'autotrim_trim_integrity',
     'trim_integrity', 'trim_config']
 tags = ['functional', 'trim']
 
-[/opt/zfs-tests/tests/functional/truncate]
+[tests/functional/truncate]
 tests = ['truncate_001_pos', 'truncate_002_pos']
+tags = ['functional', 'truncate']
 
-[/opt/zfs-tests/tests/functional/upgrade]
+[tests/functional/upgrade]
 tests = ['upgrade_userobj_001_pos', 'upgrade_projectquota_001_pos',
     'upgrade_readonly_pool']
+tags = ['functional', 'upgrade']
 
-[/opt/zfs-tests/tests/functional/userquota]
+[tests/functional/userquota]
 tests = [
     'userquota_001_pos', 'userquota_002_pos', 'userquota_003_pos',
     'userquota_004_pos', 'userquota_005_neg', 'userquota_006_pos',
@@ -700,48 +816,68 @@ tests = [
     'userquota_013_pos',
     'userspace_001_pos', 'userspace_002_pos', 'userspace_003_pos',
     'groupspace_001_pos', 'groupspace_002_pos', 'groupspace_003_pos' ]
+tags = ['functional', 'userquota']
 
-[/opt/zfs-tests/tests/functional/utils_test]
+[tests/functional/utils_test]
 tests = ['utils_test_001_pos', 'utils_test_002_pos', 'utils_test_003_pos',
     'utils_test_004_pos', 'utils_test_005_pos', 'utils_test_006_pos',
     'utils_test_007_pos', 'utils_test_008_pos', 'utils_test_009_pos']
+tags = ['functional', 'utils_test']
 
-[/opt/zfs-tests/tests/functional/vdev_zaps]
+[tests/functional/vdev_zaps]
 tests = ['vdev_zaps_001_pos', 'vdev_zaps_002_pos', 'vdev_zaps_003_pos',
     'vdev_zaps_004_pos', 'vdev_zaps_005_pos', 'vdev_zaps_006_pos',
     'vdev_zaps_007_pos']
+tags = ['functional', 'vdev_zaps']
 
-[/opt/zfs-tests/tests/functional/write_dirs]
+[tests/functional/write_dirs]
 tests = ['write_dirs_001_pos', 'write_dirs_002_pos']
+tags = ['functional', 'write_dirs']
 
-[/opt/zfs-tests/tests/functional/xattr]
+[tests/functional/xattr]
 tests = ['xattr_001_pos', 'xattr_002_neg', 'xattr_003_neg', 'xattr_004_pos',
     'xattr_005_pos', 'xattr_006_pos', 'xattr_007_neg', 'xattr_008_pos',
     'xattr_009_neg', 'xattr_010_neg', 'xattr_011_pos', 'xattr_012_pos',
     'xattr_013_pos']
+tags = ['functional', 'xattr']
 
-[/opt/zfs-tests/tests/functional/zvol/zvol_ENOSPC]
+[tests/functional/zvol/zvol_ENOSPC]
 tests = ['zvol_ENOSPC_001_pos']
+tags = ['functional', 'zvol', 'zvol_ENOSPC']
 
-[/opt/zfs-tests/tests/functional/zvol/zvol_cli]
+[tests/functional/zvol/zvol_cli]
 tests = ['zvol_cli_001_pos', 'zvol_cli_002_pos', 'zvol_cli_003_neg']
+tags = ['functional', 'zvol', 'zvol_cli']
 
-[/opt/zfs-tests/tests/functional/zvol/zvol_dump]
+[tests/functional/zvol/zvol_dump]
 tests = ['zvol_dump_raidz']
+tags = ['functional', 'zvol', 'zvol_dump']
 pre =
 post =
 
-[/opt/zfs-tests/tests/functional/zvol/zvol_misc]
+[tests/functional/zvol/zvol_misc]
 tests = ['zvol_misc_001_neg', 'zvol_misc_002_pos', 'zvol_misc_003_neg',
     'zvol_misc_004_pos', 'zvol_misc_005_neg', 'zvol_misc_006_pos']
+tags = ['functional', 'zvol', 'zvol_misc']
 
-[/opt/zfs-tests/tests/functional/libzfs]
-tests = ['many_fds']
-pre =
-post =
+[tests/functional/zvol/zvol_swap]
+tests = ['zvol_swap_001_pos', 'zvol_swap_002_pos', 'zvol_swap_003_pos',
+    'zvol_swap_004_pos', 'zvol_swap_005_pos', 'zvol_swap_006_pos']
+tags = ['functional', 'zvol', 'zvol_swap']
+
+[tests/functional/libzfs]
+tests = ['many_fds', 'libzfs_input']
+tags = ['functional', 'libzfs']
 
-[/opt/zfs-tests/tests/functional/log_spacemap]
+[tests/functional/log_spacemap]
 tests = ['log_spacemap_import_logs']
+tags = ['functional', 'log_spacemap']
 pre =
 post =
-tags = ['functional', 'log_spacemap']
+
+[tests/functional/l2arc]
+tests = ['l2arc_arcstats_pos', 'l2arc_mfuonly_pos',
+    'persist_l2arc_001_pos', 'persist_l2arc_002_pos',
+    'persist_l2arc_003_neg', 'persist_l2arc_004_pos', 'persist_l2arc_005_pos',
+    'persist_l2arc_006_pos', 'persist_l2arc_007_pos', 'persist_l2arc_008_pos']
+tags = ['functional', 'l2arc']
diff --git a/usr/src/test/zfs-tests/runfiles/omnios.run b/usr/src/test/zfs-tests/runfiles/omnios.run
index f92d12e839..9bbefa1413 100644
--- a/usr/src/test/zfs-tests/runfiles/omnios.run
+++ b/usr/src/test/zfs-tests/runfiles/omnios.run
@@ -25,734 +25,3 @@ timeout = 1800
 post_user = root
 post = cleanup
 outputdir = /var/tmp/test_results
-
-[/opt/zfs-tests/tests/functional/acl/cifs]
-tests = ['cifs_attr_001_pos', 'cifs_attr_002_pos', 'cifs_attr_003_pos',
-    'cifs_attr_004_pos']
-
-[/opt/zfs-tests/tests/functional/acl/nontrivial]
-tests = ['zfs_acl_chmod_001_neg', 'zfs_acl_chmod_002_pos',
-    'zfs_acl_chmod_aclmode_001_pos', 'zfs_acl_chmod_compact_001_pos',
-    'zfs_acl_chmod_delete_001_pos', 'zfs_acl_chmod_inherit_001_pos',
-    'zfs_acl_chmod_inherit_002_neg', 'zfs_acl_chmod_inherit_002_pos',
-    'zfs_acl_chmod_inherit_003_pos', 'zfs_acl_chmod_inherit_004_pos',
-    'zfs_acl_chmod_owner_001_pos', 'zfs_acl_chmod_rwacl_001_pos',
-    'zfs_acl_chmod_rwx_001_pos', 'zfs_acl_chmod_rwx_002_pos',
-    'zfs_acl_chmod_rwx_003_pos', 'zfs_acl_chmod_rwx_004_pos',
-    'zfs_acl_chmod_xattr_001_pos', 'zfs_acl_chmod_xattr_002_pos',
-    'zfs_acl_cp_001_pos', 'zfs_acl_cp_002_pos', 'zfs_acl_cpio_001_pos',
-    'zfs_acl_cpio_002_pos', 'zfs_acl_find_001_pos', 'zfs_acl_ls_001_pos',
-    'zfs_acl_mv_001_pos', 'zfs_acl_tar_001_pos', 'zfs_acl_tar_002_pos',
-    'zfs_acl_aclmode_restricted_001_neg']
-
-[/opt/zfs-tests/tests/functional/acl/trivial]
-tests = ['zfs_acl_chmod_001_pos', 'zfs_acl_compress_001_pos',
-    'zfs_acl_cp_001_pos', 'zfs_acl_cp_002_neg', 'zfs_acl_cp_003_neg',
-    'zfs_acl_find_001_pos', 'zfs_acl_find_002_neg', 'zfs_acl_ls_001_pos',
-    'zfs_acl_ls_002_neg', 'zfs_acl_mv_001_pos', 'zfs_acl_pack_001_pos',
-    'zfs_acl_pax_001_pos', 'zfs_acl_pax_002_pos', 'zfs_acl_pax_003_pos',
-    'zfs_acl_pax_004_pos', 'zfs_acl_pax_005_pos', 'zfs_acl_pax_006_pos',
-    'zfs_acl_tar_001_pos', 'zfs_acl_tar_002_neg',
-    'zfs_acl_aclmode_restricted_001_pos']
-
-[/opt/zfs-tests/tests/functional/alloc_class]
-tests = ['alloc_class_001_pos', 'alloc_class_002_neg', 'alloc_class_003_pos',
-    'alloc_class_004_pos', 'alloc_class_005_pos', 'alloc_class_006_pos',
-    'alloc_class_007_pos', 'alloc_class_008_pos', 'alloc_class_009_pos',
-    'alloc_class_010_pos', 'alloc_class_011_neg', 'alloc_class_012_pos',
-    'alloc_class_013_pos']
-tags = ['functional', 'alloc_class']
-
-[/opt/zfs-tests/tests/functional/atime]
-tests = ['atime_001_pos', 'atime_002_neg']
-
-[/opt/zfs-tests/tests/functional/bootfs]
-tests = ['bootfs_001_pos', 'bootfs_002_neg', 'bootfs_003_pos',
-    'bootfs_004_neg', 'bootfs_005_neg', 'bootfs_006_pos', 'bootfs_007_pos',
-    'bootfs_008_pos']
-
-[/opt/zfs-tests/tests/functional/cache]
-tests = ['cache_001_pos', 'cache_002_pos', 'cache_003_pos', 'cache_004_neg',
-    'cache_005_neg', 'cache_006_pos', 'cache_007_neg', 'cache_008_neg',
-    'cache_009_pos', 'cache_010_neg', 'cache_011_pos', 'cache_012_pos']
-
-[/opt/zfs-tests/tests/functional/cachefile]
-tests = ['cachefile_001_pos', 'cachefile_002_pos', 'cachefile_003_pos',
-    'cachefile_004_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/casenorm]
-tests = ['case_all_values', 'norm_all_values',
-    'sensitive_none_lookup', 'sensitive_none_delete',
-    'sensitive_formd_lookup', 'sensitive_formd_delete',
-    'insensitive_none_lookup', 'insensitive_none_delete',
-    'insensitive_formd_lookup', 'insensitive_formd_delete',
-    'mixed_none_lookup', 'mixed_none_lookup_ci', 'mixed_none_delete',
-    'mixed_formd_lookup', 'mixed_formd_lookup_ci', 'mixed_formd_delete']
-
-[/opt/zfs-tests/tests/functional/channel_program/lua_core]
-autotests = 1
-
-[/opt/zfs-tests/tests/functional/channel_program/synctask_core]
-autotests = 1
-
-[/opt/zfs-tests/tests/functional/checksum]
-tests = ['run_edonr_test', 'run_sha2_test', 'run_skein_test']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/clean_mirror]
-tests = [ 'clean_mirror_001_pos', 'clean_mirror_002_pos',
-    'clean_mirror_003_pos', 'clean_mirror_004_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zdb]
-tests = ['zdb_001_neg', 'zdb_002_pos', 'zdb_003_pos', 'zdb_004_pos',
-    'zdb_005_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs]
-tests = ['zfs_001_neg', 'zfs_002_pos', 'zfs_003_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_change-key]
-tests = ['zfs_change-key', 'zfs_change-key_child', 'zfs_change-key_format',
-    'zfs_change-key_inherit', 'zfs_change-key_load', 'zfs_change-key_location',
-    'zfs_change-key_pbkdf2iters', 'zfs_change-key_clones']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_clone]
-tests = ['zfs_clone_001_neg', 'zfs_clone_002_pos', 'zfs_clone_003_pos',
-    'zfs_clone_004_pos', 'zfs_clone_005_pos', 'zfs_clone_006_pos',
-    'zfs_clone_007_pos', 'zfs_clone_008_neg', 'zfs_clone_009_neg',
-    'zfs_clone_010_pos', 'zfs_clone_encrypted']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_copies]
-tests = ['zfs_copies_001_pos', 'zfs_copies_002_pos', 'zfs_copies_003_pos',
-    'zfs_copies_004_neg', 'zfs_copies_005_neg', 'zfs_copies_006_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_create]
-tests = ['zfs_create_001_pos', 'zfs_create_002_pos', 'zfs_create_003_pos',
-    'zfs_create_004_pos', 'zfs_create_005_pos', 'zfs_create_006_pos',
-    'zfs_create_007_pos', 'zfs_create_008_neg', 'zfs_create_009_neg',
-    'zfs_create_010_neg', 'zfs_create_011_pos', 'zfs_create_012_pos',
-    'zfs_create_013_pos', 'zfs_create_encrypted', 'zfs_create_crypt_combos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_destroy]
-tests = ['zfs_destroy_001_pos', 'zfs_destroy_002_pos', 'zfs_destroy_003_pos',
-    'zfs_destroy_004_pos', 'zfs_destroy_005_neg', 'zfs_destroy_006_neg',
-    'zfs_destroy_007_neg', 'zfs_destroy_008_pos', 'zfs_destroy_009_pos',
-    'zfs_destroy_010_pos', 'zfs_destroy_011_pos', 'zfs_destroy_012_pos',
-    'zfs_destroy_013_neg', 'zfs_destroy_014_pos', 'zfs_destroy_015_pos',
-    'zfs_destroy_016_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_diff]
-tests = ['zfs_diff_changes', 'zfs_diff_cliargs', 'zfs_diff_timestamp',
-    'zfs_diff_types', 'zfs_diff_encrypted']
-tags = ['functional', 'cli_root', 'zfs_diff']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_get]
-tests = ['zfs_get_001_pos', 'zfs_get_002_pos', 'zfs_get_003_pos',
-    'zfs_get_004_pos', 'zfs_get_005_neg', 'zfs_get_006_neg', 'zfs_get_007_neg',
-    'zfs_get_008_pos', 'zfs_get_009_pos', 'zfs_get_010_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_inherit]
-tests = ['zfs_inherit_001_neg', 'zfs_inherit_002_neg', 'zfs_inherit_003_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_load-key]
-tests = ['zfs_load-key', 'zfs_load-key_all', 'zfs_load-key_file',
-    'zfs_load-key_location', 'zfs_load-key_noop', 'zfs_load-key_recursive']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_mount]
-tests = ['zfs_mount_001_pos', 'zfs_mount_002_pos', 'zfs_mount_003_pos',
-    'zfs_mount_004_pos', 'zfs_mount_005_pos', 'zfs_mount_006_pos',
-    'zfs_mount_007_pos', 'zfs_mount_008_pos', 'zfs_mount_009_neg',
-    'zfs_mount_010_neg', 'zfs_mount_011_neg', 'zfs_mount_012_neg',
-    'zfs_mount_all_001_pos', 'zfs_mount_all_fail', 'zfs_mount_all_mountpoints',
-    'zfs_mount_encrypted']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_program]
-tests = ['zfs_program_json']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_promote]
-tests = ['zfs_promote_001_pos', 'zfs_promote_002_pos', 'zfs_promote_003_pos',
-    'zfs_promote_004_pos', 'zfs_promote_005_pos', 'zfs_promote_006_neg',
-    'zfs_promote_007_neg', 'zfs_promote_008_pos', 'zfs_promote_encryptionroot']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_property]
-tests = ['zfs_written_property_001_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_receive]
-tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos',
-    'zfs_receive_005_neg', 'zfs_receive_006_pos',
-    'zfs_receive_007_neg', 'zfs_receive_008_pos', 'zfs_receive_009_neg',
-    'zfs_receive_010_pos', 'zfs_receive_011_pos', 'zfs_receive_012_pos',
-    'zfs_receive_013_pos', 'zfs_receive_014_pos', 'zfs_receive_015_pos',
-    'receive-o-x_props_override', 'zfs_receive_from_encrypted',
-    'zfs_receive_to_encrypted' 'zfs_receive_raw',
-    'zfs_receive_raw_incremental']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_remap]
-tests = ['zfs_remap_cliargs', 'zfs_remap_obsolete_counts']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_rename]
-tests = ['zfs_rename_001_pos', 'zfs_rename_002_pos', 'zfs_rename_003_pos',
-    'zfs_rename_004_neg', 'zfs_rename_005_neg', 'zfs_rename_006_pos',
-    'zfs_rename_007_pos', 'zfs_rename_008_pos', 'zfs_rename_009_neg',
-    'zfs_rename_010_neg', 'zfs_rename_011_pos', 'zfs_rename_012_neg',
-    'zfs_rename_013_pos', 'zfs_rename_014_neg', 'zfs_rename_encrypted_child',
-    'zfs_rename_to_encrypted']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_reservation]
-tests = ['zfs_reservation_001_pos', 'zfs_reservation_002_pos']
-
-[/opt/zfs-tests/tests/functional/resilver]
-tests = ['resilver_restart_001', 'resilver_restart_002']
-tags = ['functional', 'resilver']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_rollback]
-tests = ['zfs_rollback_001_pos', 'zfs_rollback_002_pos',
-    'zfs_rollback_003_neg', 'zfs_rollback_004_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_send]
-tests = ['zfs_send_001_pos', 'zfs_send_002_pos', 'zfs_send_003_pos',
-    'zfs_send_004_neg', 'zfs_send_005_pos', 'zfs_send_006_pos',
-    'zfs_send_007_pos', 'zfs_send_encrypted', 'zfs_send_raw',
-    'zfs_send-b']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_set]
-tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
-    'canmount_002_pos', 'canmount_003_pos', 'canmount_004_pos',
-    'checksum_001_pos', 'compression_001_pos', 'mountpoint_001_pos',
-    'mountpoint_002_pos', 'mountpoint_003_pos', 'onoffs_001_pos',
-    'property_alias_001_pos', 'readonly_001_pos', 'reservation_001_neg',
-    'ro_props_001_pos', 'share_mount_001_neg', 'snapdir_001_pos',
-    'user_property_001_pos', 'user_property_002_pos', 'user_property_003_neg',
-    'user_property_004_pos', 'version_001_neg', 'zfs_set_001_neg',
-    'zfs_set_002_neg', 'zfs_set_003_neg', 'zfs_set_keylocation']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_share]
-tests = ['zfs_share_001_pos', 'zfs_share_002_pos', 'zfs_share_003_pos',
-    'zfs_share_004_pos', 'zfs_share_005_pos', 'zfs_share_006_pos',
-    'zfs_share_007_neg', 'zfs_share_008_neg', 'zfs_share_009_neg',
-    'zfs_share_010_neg', 'zfs_share_011_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_snapshot]
-tests = ['zfs_snapshot_001_neg', 'zfs_snapshot_002_neg',
-    'zfs_snapshot_003_neg', 'zfs_snapshot_004_neg', 'zfs_snapshot_005_neg',
-    'zfs_snapshot_006_pos', 'zfs_snapshot_007_neg', 'zfs_snapshot_008_neg',
-    'zfs_snapshot_009_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unload-key]
-tests = ['zfs_unload-key', 'zfs_unload-key_all', 'zfs_unload-key_recursive']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unmount]
-tests = ['zfs_unmount_001_pos', 'zfs_unmount_002_pos', 'zfs_unmount_003_pos',
-    'zfs_unmount_004_pos', 'zfs_unmount_005_pos', 'zfs_unmount_006_pos',
-    'zfs_unmount_007_neg', 'zfs_unmount_008_neg', 'zfs_unmount_009_pos',
-    'zfs_unmount_all_001_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unshare]
-tests = ['zfs_unshare_001_pos', 'zfs_unshare_002_pos', 'zfs_unshare_003_pos',
-    'zfs_unshare_004_neg', 'zfs_unshare_005_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_upgrade]
-tests = ['zfs_upgrade_001_pos', 'zfs_upgrade_002_pos', 'zfs_upgrade_003_pos',
-    'zfs_upgrade_004_pos', 'zfs_upgrade_005_pos', 'zfs_upgrade_006_neg',
-    'zfs_upgrade_007_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool]
-tests = ['zpool_001_neg', 'zpool_002_pos', 'zpool_003_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_add]
-tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos',
-    'zpool_add_004_pos', 'zpool_add_005_pos', 'zpool_add_006_pos',
-    'zpool_add_007_neg', 'zpool_add_008_neg', 'zpool_add_009_neg',
-    'zpool_add_010_pos',
-    'add_nested_replacing_spare', 'add-o_ashift', 'add_prop_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_attach]
-tests = ['zpool_attach_001_neg', 'attach-o_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_clear]
-tests = ['zpool_clear_001_pos', 'zpool_clear_002_neg', 'zpool_clear_003_neg',
-    'zpool_clear_readonly']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_create]
-tests = ['zpool_create_001_pos', 'zpool_create_002_pos',
-    'zpool_create_003_pos', 'zpool_create_004_pos', 'zpool_create_005_pos',
-    'zpool_create_006_pos', 'zpool_create_007_neg', 'zpool_create_008_pos',
-    'zpool_create_009_neg', 'zpool_create_010_neg', 'zpool_create_011_neg',
-    'zpool_create_012_neg', 'zpool_create_014_neg',
-    'zpool_create_015_neg', 'zpool_create_016_pos', 'zpool_create_017_neg',
-    'zpool_create_018_pos', 'zpool_create_019_pos', 'zpool_create_020_pos',
-    'zpool_create_021_pos', 'zpool_create_022_pos', 'zpool_create_023_neg',
-    'zpool_create_024_pos',
-    'zpool_create_encrypted', 'zpool_create_crypt_combos',
-    'zpool_create_features_001_pos', 'zpool_create_features_002_pos',
-    'zpool_create_features_003_pos', 'zpool_create_features_004_neg',
-    'zpool_create_features_005_pos', 'zpool_create_tempname', 'create-o_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_destroy]
-tests = ['zpool_destroy_001_pos', 'zpool_destroy_002_pos',
-    'zpool_destroy_003_neg']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_detach]
-tests = ['zpool_detach_001_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_expand]
-tests = ['zpool_expand_001_pos', 'zpool_expand_002_pos',
-    'zpool_expand_003_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_export]
-tests = ['zpool_export_001_pos', 'zpool_export_002_pos',
-    'zpool_export_003_neg', 'zpool_export_004_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_get]
-tests = ['zpool_get_001_pos', 'zpool_get_002_pos', 'zpool_get_003_pos',
-    'zpool_get_004_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_history]
-tests = ['zpool_history_001_neg', 'zpool_history_002_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_import]
-tests = ['zpool_import_001_pos', 'zpool_import_002_pos',
-    'zpool_import_003_pos', 'zpool_import_004_pos', 'zpool_import_005_pos',
-    'zpool_import_006_pos', 'zpool_import_007_pos', 'zpool_import_008_pos',
-    'zpool_import_009_neg', 'zpool_import_010_pos', 'zpool_import_011_neg',
-    'zpool_import_012_pos', 'zpool_import_013_neg', 'zpool_import_014_pos',
-    'zpool_import_all_001_pos',
-    'zpool_import_features_001_pos', 'zpool_import_features_002_neg',
-    'zpool_import_features_003_pos', 'zpool_import_missing_001_pos',
-    'zpool_import_missing_002_pos', 'zpool_import_missing_003_pos',
-    'zpool_import_rename_001_pos',
-    'import_cachefile_device_added',
-    'import_cachefile_device_removed',
-    'import_cachefile_mirror_attached',
-    'import_cachefile_mirror_detached',
-    'import_cachefile_device_replaced',
-    'import_rewind_config_changed',
-    'import_cachefile_shared_device',
-    'import_paths_changed',
-    'import_devices_missing',
-    'zpool_import_encrypted', 'zpool_import_encrypted_load']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_labelclear]
-tests = ['zpool_labelclear_active', 'zpool_labelclear_exported',
-    'zpool_labelclear_removed', 'zpool_labelclear_valid']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_initialize]
-tests = ['zpool_initialize_attach_detach_add_remove',
-    'zpool_initialize_import_export',
-    'zpool_initialize_offline_export_import_online',
-    'zpool_initialize_online_offline',
-    'zpool_initialize_split',
-    'zpool_initialize_start_and_cancel_neg',
-    'zpool_initialize_start_and_cancel_pos',
-    'zpool_initialize_suspend_resume',
-    'zpool_initialize_unsupported_vdevs',
-    'zpool_initialize_verify_checksums',
-    'zpool_initialize_verify_initialized']
-pre =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_offline]
-tests = ['zpool_offline_001_pos', 'zpool_offline_002_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_online]
-tests = ['zpool_online_001_pos', 'zpool_online_002_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_remove]
-tests = ['zpool_remove_001_neg', 'zpool_remove_002_pos',
-    'zpool_remove_003_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_replace]
-tests = ['zpool_replace_001_neg', 'zpool_replace_002_neg', 'replace-o_ashift',
-    'replace_prop_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_resilver]
-tests = ['zpool_resilver_bad_args', 'zpool_resilver_restart']
-tags = ['functional', 'cli_root', 'zpool_resilver']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_scrub]
-tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos',
-    'zpool_scrub_004_pos', 'zpool_scrub_005_pos', 'zpool_scrub_print_repairing',
-    'zpool_scrub_offline_device', 'zpool_scrub_multiple_copies',
-    'zpool_scrub_encrypted_unloaded']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_set]
-tests = ['zpool_set_001_pos', 'zpool_set_002_neg', 'zpool_set_003_neg',
-    'zpool_set_ashift']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_status]
-tests = ['zpool_status_001_pos', 'zpool_status_002_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_sync]
-tests = ['zpool_sync_001_pos', 'zpool_sync_002_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_trim]
-tests = ['zpool_trim_attach_detach_add_remove',
-    'zpool_trim_import_export', 'zpool_trim_multiple', 'zpool_trim_neg',
-    'zpool_trim_offline_export_import_online', 'zpool_trim_online_offline',
-    'zpool_trim_partial', 'zpool_trim_rate', 'zpool_trim_rate_neg',
-    'zpool_trim_secure', 'zpool_trim_split', 'zpool_trim_start_and_cancel_neg',
-    'zpool_trim_start_and_cancel_pos', 'zpool_trim_suspend_resume',
-    'zpool_trim_unsupported_vdevs', 'zpool_trim_verify_checksums',
-    'zpool_trim_verify_trimmed']
-tags = ['functional', 'zpool_trim']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_upgrade]
-tests = ['zpool_upgrade_001_pos', 'zpool_upgrade_002_pos',
-    'zpool_upgrade_003_pos', 'zpool_upgrade_004_pos', 'zpool_upgrade_005_neg',
-    'zpool_upgrade_006_neg', 'zpool_upgrade_007_pos', 'zpool_upgrade_008_pos',
-    'zpool_upgrade_009_neg']
-
-[/opt/zfs-tests/tests/functional/cli_user/misc]
-tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
-    'zfs_clone_001_neg', 'zfs_create_001_neg', 'zfs_destroy_001_neg',
-    'zfs_get_001_neg', 'zfs_inherit_001_neg', 'zfs_mount_001_neg',
-    'zfs_promote_001_neg', 'zfs_receive_001_neg', 'zfs_rename_001_neg',
-    'zfs_rollback_001_neg', 'zfs_send_001_neg', 'zfs_set_001_neg',
-    'zfs_share_001_neg', 'zfs_snapshot_001_neg', 'zfs_unallow_001_neg',
-    'zfs_unmount_001_neg', 'zfs_unshare_001_neg', 'zfs_upgrade_001_neg',
-    'zpool_001_neg', 'zpool_add_001_neg', 'zpool_attach_001_neg',
-    'zpool_clear_001_neg', 'zpool_create_001_neg', 'zpool_destroy_001_neg',
-    'zpool_detach_001_neg', 'zpool_export_001_neg', 'zpool_get_001_neg',
-    'zpool_history_001_neg', 'zpool_import_001_neg', 'zpool_import_002_neg',
-    'zpool_offline_001_neg', 'zpool_online_001_neg', 'zpool_remove_001_neg',
-    'zpool_replace_001_neg', 'zpool_scrub_001_neg', 'zpool_set_001_neg',
-    'zpool_status_001_neg', 'zpool_upgrade_001_neg']
-user =
-
-[/opt/zfs-tests/tests/functional/cli_user/zfs_list]
-tests = ['zfs_list_001_pos', 'zfs_list_002_pos', 'zfs_list_003_pos',
-    'zfs_list_004_neg', 'zfs_list_007_pos', 'zfs_list_008_neg']
-user =
-
-[/opt/zfs-tests/tests/functional/cli_user/zpool_iostat]
-tests = ['zpool_iostat_001_neg', 'zpool_iostat_002_pos',
-    'zpool_iostat_003_neg', 'zpool_iostat_004_pos']
-user =
-
-[/opt/zfs-tests/tests/functional/cli_user/zpool_list]
-tests = ['zpool_list_001_pos', 'zpool_list_002_neg']
-user =
-
-[/opt/zfs-tests/tests/functional/compression]
-tests = ['compress_001_pos', 'compress_002_pos', 'compress_003_pos',
-    'compress_004_pos', 'l2arc_compressed_arc', 'l2arc_compressed_arc_disabled']
-
-[/opt/zfs-tests/tests/functional/ctime]
-tests = ['ctime_001_pos' ]
-
-[/opt/zfs-tests/tests/functional/delegate]
-tests = ['zfs_allow_001_pos', 'zfs_allow_002_pos',
-    'zfs_allow_004_pos', 'zfs_allow_005_pos', 'zfs_allow_006_pos',
-    'zfs_allow_007_pos', 'zfs_allow_008_pos', 'zfs_allow_009_neg',
-    'zfs_allow_010_pos', 'zfs_allow_011_neg', 'zfs_allow_012_neg',
-    'zfs_unallow_001_pos', 'zfs_unallow_002_pos', 'zfs_unallow_003_pos',
-    'zfs_unallow_004_pos', 'zfs_unallow_005_pos', 'zfs_unallow_006_pos',
-    'zfs_unallow_007_neg', 'zfs_unallow_008_neg']
-
-[/opt/zfs-tests/tests/functional/devices]
-tests = ['devices_001_pos', 'devices_002_neg', 'devices_003_pos']
-
-[/opt/zfs-tests/tests/functional/exec]
-tests = ['exec_001_pos', 'exec_002_neg']
-
-[/opt/zfs-tests/tests/functional/fault]
-tests = ['zpool_status_-s']
-
-[/opt/zfs-tests/tests/functional/features/async_destroy]
-tests = ['async_destroy_001_pos']
-
-[/opt/zfs-tests/tests/functional/grow_pool]
-tests = ['grow_pool_001_pos']
-
-[/opt/zfs-tests/tests/functional/grow_replicas]
-tests = ['grow_replicas_001_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/history]
-tests = ['history_001_pos', 'history_002_pos', 'history_003_pos',
-    'history_004_pos', 'history_005_neg', 'history_006_neg', 'history_007_pos',
-    'history_008_pos', 'history_009_pos', 'history_010_pos']
-
-[/opt/zfs-tests/tests/functional/holes]
-tests = ['holes_sanity']
-
-[/opt/zfs-tests/tests/functional/inheritance]
-tests = ['inherit_001_pos']
-pre =
-
-[/opt/zfs-tests/tests/functional/inuse]
-tests = ['inuse_001_pos', 'inuse_003_pos', 'inuse_004_pos',
-    'inuse_005_pos', 'inuse_006_pos', 'inuse_007_pos', 'inuse_008_pos',
-    'inuse_009_pos']
-post =
-
-[/opt/zfs-tests/tests/functional/large_dnode]
-tests = ['large_dnode_001_pos', 'large_dnode_003_pos',
-    'large_dnode_004_neg', 'large_dnode_005_pos', 'large_dnode_007_neg']
-
-[/opt/zfs-tests/tests/functional/large_files]
-tests = ['large_files_001_pos']
-
-[/opt/zfs-tests/tests/functional/largest_pool]
-tests = ['largest_pool_001_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/link_count]
-tests = ['link_count_001']
-
-[/opt/zfs-tests/tests/functional/mdb]
-tests = ['mdb_001_pos']
-
-[/opt/zfs-tests/tests/functional/migration]
-tests = ['migration_001_pos', 'migration_002_pos', 'migration_003_pos',
-    'migration_004_pos', 'migration_005_pos', 'migration_006_pos',
-    'migration_007_pos', 'migration_008_pos', 'migration_009_pos',
-    'migration_010_pos', 'migration_011_pos', 'migration_012_pos']
-
-[/opt/zfs-tests/tests/functional/mmap]
-tests = ['mmap_read_001_pos', 'mmap_write_001_pos']
-
-[/opt/zfs-tests/tests/functional/mmp]
-tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval',
-    'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import',
-    'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history',
-    'mmp_on_zdb']
-
-[/opt/zfs-tests/tests/functional/mount]
-tests = ['umount_001', 'umount_002', 'umountall_001']
-
-[/opt/zfs-tests/tests/functional/mv_files]
-tests = ['mv_files_001_pos', 'mv_files_002_pos']
-
-[/opt/zfs-tests/tests/functional/nestedfs]
-tests = ['nestedfs_001_pos']
-
-[/opt/zfs-tests/tests/functional/no_space]
-tests = ['enospc_001_pos', 'enospc_002_pos']
-
-[/opt/zfs-tests/tests/functional/nopwrite]
-tests = ['nopwrite_copies', 'nopwrite_mtime', 'nopwrite_negative',
-    'nopwrite_promoted_clone', 'nopwrite_recsize', 'nopwrite_sync',
-    'nopwrite_varying_compression', 'nopwrite_volume']
-
-[/opt/zfs-tests/tests/functional/online_offline]
-tests = ['online_offline_001_pos', 'online_offline_002_neg',
-    'online_offline_003_neg']
-
-[/opt/zfs-tests/tests/functional/pool_checkpoint]
-tests = ['checkpoint_after_rewind', 'checkpoint_big_rewind',
-    'checkpoint_capacity', 'checkpoint_conf_change', 'checkpoint_discard',
-    'checkpoint_discard_busy', 'checkpoint_discard_many',
-    'checkpoint_indirect', 'checkpoint_invalid', 'checkpoint_lun_expsz',
-    'checkpoint_open', 'checkpoint_removal', 'checkpoint_rewind',
-    'checkpoint_ro_rewind', 'checkpoint_sm_scale', 'checkpoint_twice',
-    'checkpoint_vdev_add', 'checkpoint_zdb', 'checkpoint_zhack_feat']
-
-[/opt/zfs-tests/tests/functional/pool_names]
-tests = ['pool_names_001_pos', 'pool_names_002_neg']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/poolversion]
-tests = ['poolversion_001_pos', 'poolversion_002_pos']
-
-[/opt/zfs-tests/tests/functional/privilege]
-tests = ['privilege_001_pos', 'privilege_002_pos']
-
-[/opt/zfs-tests/tests/functional/projectquota]
-tests = ['projectid_001_pos', 'projectid_002_pos', 'projectid_003_pos',
-    'projectquota_001_pos', 'projectquota_002_pos', 'projectquota_003_pos',
-    'projectquota_004_neg', 'projectquota_005_pos', 'projectquota_006_pos',
-    'projectquota_007_pos', 'projectquota_008_pos', 'projectquota_009_pos',
-    'projectspace_001_pos', 'projectspace_002_pos', 'projectspace_003_pos',
-    'projectspace_004_pos',
-    'projecttree_002_pos', 'projecttree_003_neg' ]
-
-[/opt/zfs-tests/tests/functional/quota]
-tests = ['quota_001_pos', 'quota_002_pos', 'quota_003_pos', 'quota_004_pos',
-    'quota_005_pos', 'quota_006_neg']
-
-[/opt/zfs-tests/tests/functional/raidz]
-tests = ['raidz_001_neg', 'raidz_002_pos']
-
-[/opt/zfs-tests/tests/functional/redundancy]
-tests = ['redundancy_001_pos', 'redundancy_002_pos', 'redundancy_003_pos',
-    'redundancy_004_neg']
-
-[/opt/zfs-tests/tests/functional/refquota]
-tests = ['refquota_001_pos', 'refquota_002_pos', 'refquota_003_pos',
-    'refquota_004_pos', 'refquota_005_pos', 'refquota_006_neg']
-
-[/opt/zfs-tests/tests/functional/refreserv]
-tests = ['refreserv_001_pos', 'refreserv_002_pos', 'refreserv_003_pos',
-    'refreserv_004_pos', 'refreserv_005_pos', 'refreserv_raidz',
-    'refreserv_multi_raidz']
-
-[/opt/zfs-tests/tests/functional/removal]
-pre =
-tests = ['removal_sanity', 'removal_all_vdev', 'removal_check_space',
-    'removal_condense_export',
-    'removal_multiple_indirection', 'removal_remap',
-    'removal_remap_deadlists',
-    'removal_with_add', 'removal_with_create_fs', 'removal_with_dedup',
-    'removal_with_export', 'removal_with_ganging', 'removal_with_remap',
-    'removal_with_remove', 'removal_with_scrub', 'removal_with_send',
-    'removal_with_send_recv', 'removal_with_snapshot', 'removal_with_write',
-    'removal_with_zdb', 'removal_resume_export',
-    'remove_mirror', 'remove_mirror_sanity', 'remove_raidz']
-
-[/opt/zfs-tests/tests/functional/rename_dirs]
-tests = ['rename_dirs_001_pos']
-
-[/opt/zfs-tests/tests/functional/replacement]
-tests = ['replacement_001_pos', 'replacement_002_pos']
-
-[/opt/zfs-tests/tests/functional/reservation]
-tests = ['reservation_001_pos', 'reservation_002_pos', 'reservation_003_pos',
-    'reservation_004_pos', 'reservation_005_pos', 'reservation_006_pos',
-    'reservation_007_pos', 'reservation_008_pos', 'reservation_009_pos',
-    'reservation_010_pos', 'reservation_011_pos', 'reservation_012_pos',
-    'reservation_013_pos', 'reservation_014_pos', 'reservation_015_pos',
-    'reservation_016_pos', 'reservation_017_pos', 'reservation_018_pos',
-    'reservation_019_pos', 'reservation_020_pos', 'reservation_021_neg',
-    'reservation_022_pos']
-
-[/opt/zfs-tests/tests/functional/rootpool]
-tests = ['rootpool_002_neg', 'rootpool_003_neg', 'rootpool_007_pos']
-
-[/opt/zfs-tests/tests/functional/rsend]
-tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos',
-    'rsend_005_pos', 'rsend_006_pos', 'rsend_007_pos', 'rsend_008_pos',
-    'rsend_009_pos', 'rsend_010_pos', 'rsend_011_pos', 'rsend_012_pos',
-    'rsend_013_pos', 'rsend_014_pos',
-    'rsend_019_pos', 'rsend_020_pos',
-    'rsend_021_pos', 'rsend_022_pos', 'rsend_024_pos',
-    'recv_secpolicy',
-    'send-c_verify_ratio', 'send-c_verify_contents', 'send-c_props',
-    'send-c_incremental', 'send-c_volume', 'send-c_zstreamdump',
-    'send-c_lz4_disabled', 'send-c_recv_lz4_disabled',
-    'send-c_mixed_compression', 'send-c_stream_size_estimate', 'send-cD',
-    'send-c_embedded_blocks', 'send-c_resume', 'send-cpL_varied_recsize',
-    'send-c_recv_dedup', 'send_encrypted_files', 'send_encrypted_hierarchy',
-    'send_encrypted_props', 'send_encrypted_truncated_files',
-    'send_realloc_files',
-    'send_realloc_encrypted_files', 'send_holds',
-    'send_mixed_raw', 'send-wDR_encrypted_zvol']
-
-[/opt/zfs-tests/tests/functional/scrub_mirror]
-tests = ['scrub_mirror_001_pos', 'scrub_mirror_002_pos',
-    'scrub_mirror_003_pos', 'scrub_mirror_004_pos']
-
-[/opt/zfs-tests/tests/functional/slog]
-tests = ['slog_001_pos', 'slog_002_pos', 'slog_003_pos', 'slog_004_pos',
-    'slog_005_pos', 'slog_006_pos', 'slog_007_pos', 'slog_008_neg',
-    'slog_009_neg', 'slog_010_neg', 'slog_011_neg', 'slog_012_neg',
-    'slog_013_pos', 'slog_014_pos', 'slog_replay_fs_001', 'slog_replay_fs_002']
-
-[/opt/zfs-tests/tests/functional/snapshot]
-tests = ['clone_001_pos', 'rollback_001_pos', 'rollback_002_pos',
-    'rollback_003_pos', 'snapshot_001_pos', 'snapshot_002_pos',
-    'snapshot_003_pos', 'snapshot_004_pos', 'snapshot_005_pos',
-    'snapshot_006_pos', 'snapshot_007_pos', 'snapshot_008_pos',
-    'snapshot_009_pos', 'snapshot_010_pos', 'snapshot_011_pos',
-    'snapshot_012_pos', 'snapshot_013_pos', 'snapshot_014_pos',
-    'snapshot_015_pos', 'snapshot_016_pos', 'snapshot_017_pos',
-    'deadlist_lock']
-
-[/opt/zfs-tests/tests/functional/snapused]
-tests = ['snapused_001_pos', 'snapused_002_pos', 'snapused_003_pos',
-    'snapused_004_pos', 'snapused_005_pos']
-
-[/opt/zfs-tests/tests/functional/sparse]
-tests = ['sparse_001_pos']
-
-[/opt/zfs-tests/tests/functional/threadsappend]
-tests = ['threadsappend_001_pos']
-
-[/opt/zfs-tests/tests/functional/trim]
-tests = ['autotrim_integrity', 'autotrim_config', 'autotrim_trim_integrity',
-    'trim_integrity', 'trim_config']
-tags = ['functional', 'trim']
-
-[/opt/zfs-tests/tests/functional/truncate]
-tests = ['truncate_001_pos', 'truncate_002_pos']
-
-[/opt/zfs-tests/tests/functional/upgrade]
-tests = ['upgrade_userobj_001_pos', 'upgrade_projectquota_001_pos',
-    'upgrade_readonly_pool']
-
-[/opt/zfs-tests/tests/functional/userquota]
-tests = [
-    'userquota_001_pos', 'userquota_002_pos', 'userquota_003_pos',
-    'userquota_004_pos', 'userquota_005_neg', 'userquota_006_pos',
-    'userquota_007_pos', 'userquota_008_pos', 'userquota_009_pos',
-    'userquota_010_pos', 'userquota_011_pos', 'userquota_012_neg',
-    'userquota_013_pos',
-    'userspace_001_pos', 'userspace_002_pos', 'userspace_003_pos',
-    'groupspace_001_pos', 'groupspace_002_pos', 'groupspace_003_pos' ]
-
-[/opt/zfs-tests/tests/functional/utils_test]
-tests = ['utils_test_001_pos', 'utils_test_002_pos', 'utils_test_003_pos',
-    'utils_test_004_pos', 'utils_test_005_pos', 'utils_test_006_pos',
-    'utils_test_007_pos', 'utils_test_008_pos', 'utils_test_009_pos']
-
-[/opt/zfs-tests/tests/functional/vdev_zaps]
-tests = ['vdev_zaps_001_pos', 'vdev_zaps_002_pos', 'vdev_zaps_003_pos',
-    'vdev_zaps_004_pos', 'vdev_zaps_005_pos', 'vdev_zaps_006_pos',
-    'vdev_zaps_007_pos']
-
-[/opt/zfs-tests/tests/functional/write_dirs]
-tests = ['write_dirs_001_pos', 'write_dirs_002_pos']
-
-[/opt/zfs-tests/tests/functional/xattr]
-tests = ['xattr_001_pos', 'xattr_002_neg', 'xattr_003_neg', 'xattr_004_pos',
-    'xattr_005_pos', 'xattr_006_pos', 'xattr_007_neg', 'xattr_008_pos',
-    'xattr_009_neg', 'xattr_010_neg', 'xattr_011_pos', 'xattr_012_pos',
-    'xattr_013_pos']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_ENOSPC]
-tests = ['zvol_ENOSPC_001_pos']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_cli]
-tests = ['zvol_cli_001_pos', 'zvol_cli_002_pos', 'zvol_cli_003_neg']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_dump]
-tests = ['zvol_dump_raidz']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_misc]
-tests = ['zvol_misc_001_neg', 'zvol_misc_002_pos', 'zvol_misc_003_neg',
-    'zvol_misc_004_pos', 'zvol_misc_005_neg', 'zvol_misc_006_pos']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_swap]
-tests = ['zvol_swap_001_pos', 'zvol_swap_002_pos', 'zvol_swap_003_pos',
-    'zvol_swap_004_pos', 'zvol_swap_005_pos', 'zvol_swap_006_pos']
-
-[/opt/zfs-tests/tests/functional/libzfs]
-tests = ['many_fds', 'libzfs_input']
-
-[/opt/zfs-tests/tests/functional/log_spacemap]
-tests = ['log_spacemap_import_logs']
-pre =
-post =
-tags = ['functional', 'log_spacemap']
-
-
-[/opt/zfs-tests/tests/functional/l2arc]
-tests = ['l2arc_arcstats_pos', 'l2arc_mfuonly_pos',
-    'persist_l2arc_001_pos', 'persist_l2arc_002_pos',
-    'persist_l2arc_003_neg', 'persist_l2arc_004_pos', 'persist_l2arc_005_pos',
-    'persist_l2arc_006_pos', 'persist_l2arc_007_pos', 'persist_l2arc_008_pos']
-tags = ['functional', 'l2arc']
diff --git a/usr/src/test/zfs-tests/runfiles/openindiana.run b/usr/src/test/zfs-tests/runfiles/openindiana.run
index bfaae22848..4e30d5daed 100644
--- a/usr/src/test/zfs-tests/runfiles/openindiana.run
+++ b/usr/src/test/zfs-tests/runfiles/openindiana.run
@@ -25,733 +25,3 @@ timeout = 1800
 post_user = root
 post = cleanup
 outputdir = /var/tmp/test_results
-
-[/opt/zfs-tests/tests/functional/acl/cifs]
-tests = ['cifs_attr_001_pos', 'cifs_attr_002_pos', 'cifs_attr_003_pos',
-    'cifs_attr_004_pos']
-
-[/opt/zfs-tests/tests/functional/acl/nontrivial]
-tests = ['zfs_acl_chmod_001_neg', 'zfs_acl_chmod_002_pos',
-    'zfs_acl_chmod_aclmode_001_pos', 'zfs_acl_chmod_compact_001_pos',
-    'zfs_acl_chmod_delete_001_pos', 'zfs_acl_chmod_inherit_001_pos',
-    'zfs_acl_chmod_inherit_002_neg', 'zfs_acl_chmod_inherit_002_pos',
-    'zfs_acl_chmod_inherit_003_pos', 'zfs_acl_chmod_inherit_004_pos',
-    'zfs_acl_chmod_owner_001_pos', 'zfs_acl_chmod_rwacl_001_pos',
-    'zfs_acl_chmod_rwx_001_pos', 'zfs_acl_chmod_rwx_002_pos',
-    'zfs_acl_chmod_rwx_003_pos', 'zfs_acl_chmod_rwx_004_pos',
-    'zfs_acl_chmod_xattr_001_pos', 'zfs_acl_chmod_xattr_002_pos',
-    'zfs_acl_cp_001_pos', 'zfs_acl_cp_002_pos', 'zfs_acl_cpio_001_pos',
-    'zfs_acl_cpio_002_pos', 'zfs_acl_find_001_pos', 'zfs_acl_ls_001_pos',
-    'zfs_acl_mv_001_pos', 'zfs_acl_tar_001_pos', 'zfs_acl_tar_002_pos',
-    'zfs_acl_aclmode_restricted_001_neg']
-
-[/opt/zfs-tests/tests/functional/acl/trivial]
-tests = ['zfs_acl_chmod_001_pos', 'zfs_acl_compress_001_pos',
-    'zfs_acl_cp_001_pos', 'zfs_acl_cp_002_neg', 'zfs_acl_cp_003_neg',
-    'zfs_acl_find_001_pos', 'zfs_acl_find_002_neg', 'zfs_acl_ls_001_pos',
-    'zfs_acl_ls_002_neg', 'zfs_acl_mv_001_pos', 'zfs_acl_pack_001_pos',
-    'zfs_acl_pax_001_pos', 'zfs_acl_pax_002_pos', 'zfs_acl_pax_003_pos',
-    'zfs_acl_pax_004_pos', 'zfs_acl_pax_005_pos', 'zfs_acl_pax_006_pos',
-    'zfs_acl_tar_001_pos', 'zfs_acl_tar_002_neg',
-    'zfs_acl_aclmode_restricted_001_pos']
-
-[/opt/zfs-tests/tests/functional/alloc_class]
-tests = ['alloc_class_001_pos', 'alloc_class_002_neg', 'alloc_class_003_pos',
-    'alloc_class_004_pos', 'alloc_class_005_pos', 'alloc_class_006_pos',
-    'alloc_class_007_pos', 'alloc_class_008_pos', 'alloc_class_009_pos',
-    'alloc_class_010_pos', 'alloc_class_011_neg', 'alloc_class_012_pos',
-    'alloc_class_013_pos']
-tags = ['functional', 'alloc_class']
-
-[/opt/zfs-tests/tests/functional/atime]
-tests = ['atime_001_pos', 'atime_002_neg']
-
-[/opt/zfs-tests/tests/functional/bootfs]
-tests = ['bootfs_001_pos', 'bootfs_002_neg', 'bootfs_003_pos',
-    'bootfs_004_neg', 'bootfs_005_neg', 'bootfs_006_pos', 'bootfs_007_pos',
-    'bootfs_008_pos']
-
-[/opt/zfs-tests/tests/functional/cache]
-tests = ['cache_001_pos', 'cache_002_pos', 'cache_003_pos', 'cache_004_neg',
-    'cache_005_neg', 'cache_006_pos', 'cache_007_neg', 'cache_008_neg',
-    'cache_009_pos', 'cache_010_neg', 'cache_011_pos', 'cache_012_pos']
-
-[/opt/zfs-tests/tests/functional/cachefile]
-tests = ['cachefile_001_pos', 'cachefile_002_pos', 'cachefile_003_pos',
-    'cachefile_004_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/casenorm]
-tests = ['case_all_values', 'norm_all_values',
-    'sensitive_none_lookup', 'sensitive_none_delete',
-    'sensitive_formd_lookup', 'sensitive_formd_delete',
-    'insensitive_none_lookup', 'insensitive_none_delete',
-    'insensitive_formd_lookup', 'insensitive_formd_delete',
-    'mixed_none_lookup', 'mixed_none_lookup_ci', 'mixed_none_delete',
-    'mixed_formd_lookup', 'mixed_formd_lookup_ci', 'mixed_formd_delete']
-
-[/opt/zfs-tests/tests/functional/channel_program/lua_core]
-autotests = 1
-
-[/opt/zfs-tests/tests/functional/channel_program/synctask_core]
-autotests = 1
-
-[/opt/zfs-tests/tests/functional/checksum]
-tests = ['run_edonr_test', 'run_sha2_test', 'run_skein_test']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/clean_mirror]
-tests = [ 'clean_mirror_001_pos', 'clean_mirror_002_pos',
-    'clean_mirror_003_pos', 'clean_mirror_004_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zdb]
-tests = ['zdb_001_neg', 'zdb_002_pos', 'zdb_003_pos', 'zdb_004_pos',
-    'zdb_005_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs]
-tests = ['zfs_001_neg', 'zfs_002_pos', 'zfs_003_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_change-key]
-tests = ['zfs_change-key', 'zfs_change-key_child', 'zfs_change-key_format',
-    'zfs_change-key_inherit', 'zfs_change-key_load', 'zfs_change-key_location',
-    'zfs_change-key_pbkdf2iters', 'zfs_change-key_clones']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_clone]
-tests = ['zfs_clone_001_neg', 'zfs_clone_002_pos', 'zfs_clone_003_pos',
-    'zfs_clone_004_pos', 'zfs_clone_005_pos', 'zfs_clone_006_pos',
-    'zfs_clone_007_pos', 'zfs_clone_008_neg', 'zfs_clone_009_neg',
-    'zfs_clone_010_pos', 'zfs_clone_encrypted']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_copies]
-tests = ['zfs_copies_001_pos', 'zfs_copies_002_pos', 'zfs_copies_003_pos',
-    'zfs_copies_004_neg', 'zfs_copies_005_neg', 'zfs_copies_006_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_create]
-tests = ['zfs_create_001_pos', 'zfs_create_002_pos', 'zfs_create_003_pos',
-    'zfs_create_004_pos', 'zfs_create_005_pos', 'zfs_create_006_pos',
-    'zfs_create_007_pos', 'zfs_create_008_neg', 'zfs_create_009_neg',
-    'zfs_create_010_neg', 'zfs_create_011_pos', 'zfs_create_012_pos',
-    'zfs_create_013_pos', 'zfs_create_encrypted', 'zfs_create_crypt_combos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_destroy]
-tests = ['zfs_destroy_001_pos', 'zfs_destroy_002_pos', 'zfs_destroy_003_pos',
-    'zfs_destroy_004_pos', 'zfs_destroy_005_neg', 'zfs_destroy_006_neg',
-    'zfs_destroy_007_neg', 'zfs_destroy_008_pos', 'zfs_destroy_009_pos',
-    'zfs_destroy_010_pos', 'zfs_destroy_011_pos', 'zfs_destroy_012_pos',
-    'zfs_destroy_013_neg', 'zfs_destroy_014_pos', 'zfs_destroy_015_pos',
-    'zfs_destroy_016_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_diff]
-tests = ['zfs_diff_changes', 'zfs_diff_cliargs', 'zfs_diff_timestamp',
-    'zfs_diff_types', 'zfs_diff_encrypted']
-tags = ['functional', 'cli_root', 'zfs_diff']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_get]
-tests = ['zfs_get_001_pos', 'zfs_get_002_pos', 'zfs_get_003_pos',
-    'zfs_get_004_pos', 'zfs_get_005_neg', 'zfs_get_006_neg', 'zfs_get_007_neg',
-    'zfs_get_008_pos', 'zfs_get_009_pos', 'zfs_get_010_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_inherit]
-tests = ['zfs_inherit_001_neg', 'zfs_inherit_002_neg', 'zfs_inherit_003_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_load-key]
-tests = ['zfs_load-key', 'zfs_load-key_all', 'zfs_load-key_file',
-    'zfs_load-key_location', 'zfs_load-key_noop', 'zfs_load-key_recursive']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_mount]
-tests = ['zfs_mount_001_pos', 'zfs_mount_002_pos', 'zfs_mount_003_pos',
-    'zfs_mount_004_pos', 'zfs_mount_005_pos', 'zfs_mount_006_pos',
-    'zfs_mount_007_pos', 'zfs_mount_008_pos', 'zfs_mount_009_neg',
-    'zfs_mount_010_neg', 'zfs_mount_011_neg', 'zfs_mount_012_neg',
-    'zfs_mount_all_001_pos', 'zfs_mount_all_fail', 'zfs_mount_all_mountpoints',
-    'zfs_mount_encrypted']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_program]
-tests = ['zfs_program_json']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_promote]
-tests = ['zfs_promote_001_pos', 'zfs_promote_002_pos', 'zfs_promote_003_pos',
-    'zfs_promote_004_pos', 'zfs_promote_005_pos', 'zfs_promote_006_neg',
-    'zfs_promote_007_neg', 'zfs_promote_008_pos', 'zfs_promote_encryptionroot']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_property]
-tests = ['zfs_written_property_001_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_receive]
-tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos',
-    'zfs_receive_005_neg', 'zfs_receive_006_pos',
-    'zfs_receive_007_neg', 'zfs_receive_008_pos', 'zfs_receive_009_neg',
-    'zfs_receive_010_pos', 'zfs_receive_011_pos', 'zfs_receive_012_pos',
-    'zfs_receive_013_pos', 'zfs_receive_014_pos', 'zfs_receive_015_pos',
-    'receive-o-x_props_override', 'zfs_receive_from_encrypted',
-    'zfs_receive_to_encrypted' 'zfs_receive_raw',
-    'zfs_receive_raw_incremental']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_remap]
-tests = ['zfs_remap_cliargs', 'zfs_remap_obsolete_counts']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_rename]
-tests = ['zfs_rename_001_pos', 'zfs_rename_002_pos', 'zfs_rename_003_pos',
-    'zfs_rename_004_neg', 'zfs_rename_005_neg', 'zfs_rename_006_pos',
-    'zfs_rename_007_pos', 'zfs_rename_008_pos', 'zfs_rename_009_neg',
-    'zfs_rename_010_neg', 'zfs_rename_011_pos', 'zfs_rename_012_neg',
-    'zfs_rename_013_pos', 'zfs_rename_014_neg', 'zfs_rename_encrypted_child',
-    'zfs_rename_to_encrypted']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_reservation]
-tests = ['zfs_reservation_001_pos', 'zfs_reservation_002_pos']
-
-[/opt/zfs-tests/tests/functional/resilver]
-tests = ['resilver_restart_001', 'resilver_restart_002']
-tags = ['functional', 'resilver']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_rollback]
-tests = ['zfs_rollback_001_pos', 'zfs_rollback_002_pos',
-    'zfs_rollback_003_neg', 'zfs_rollback_004_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_send]
-tests = ['zfs_send_001_pos', 'zfs_send_002_pos', 'zfs_send_003_pos',
-    'zfs_send_004_neg', 'zfs_send_005_pos', 'zfs_send_006_pos',
-    'zfs_send_007_pos', 'zfs_send_encrypted', 'zfs_send_raw',
-    'zfs_send-b']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_set]
-tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
-    'canmount_002_pos', 'canmount_003_pos', 'canmount_004_pos',
-    'checksum_001_pos', 'compression_001_pos', 'mountpoint_001_pos',
-    'mountpoint_002_pos', 'mountpoint_003_pos', 'onoffs_001_pos',
-    'property_alias_001_pos', 'readonly_001_pos', 'reservation_001_neg',
-    'ro_props_001_pos', 'share_mount_001_neg', 'snapdir_001_pos',
-    'user_property_001_pos', 'user_property_002_pos', 'user_property_003_neg',
-    'user_property_004_pos', 'version_001_neg', 'zfs_set_001_neg',
-    'zfs_set_002_neg', 'zfs_set_003_neg', 'zfs_set_keylocation']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_share]
-tests = ['zfs_share_001_pos', 'zfs_share_002_pos', 'zfs_share_003_pos',
-    'zfs_share_004_pos', 'zfs_share_005_pos', 'zfs_share_006_pos',
-    'zfs_share_007_neg', 'zfs_share_008_neg', 'zfs_share_009_neg',
-    'zfs_share_010_neg', 'zfs_share_011_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_snapshot]
-tests = ['zfs_snapshot_001_neg', 'zfs_snapshot_002_neg',
-    'zfs_snapshot_003_neg', 'zfs_snapshot_004_neg', 'zfs_snapshot_005_neg',
-    'zfs_snapshot_006_pos', 'zfs_snapshot_007_neg', 'zfs_snapshot_008_neg',
-    'zfs_snapshot_009_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unload-key]
-tests = ['zfs_unload-key', 'zfs_unload-key_all', 'zfs_unload-key_recursive']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unmount]
-tests = ['zfs_unmount_001_pos', 'zfs_unmount_002_pos', 'zfs_unmount_003_pos',
-    'zfs_unmount_004_pos', 'zfs_unmount_005_pos', 'zfs_unmount_006_pos',
-    'zfs_unmount_007_neg', 'zfs_unmount_008_neg', 'zfs_unmount_009_pos',
-    'zfs_unmount_all_001_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unshare]
-tests = ['zfs_unshare_001_pos', 'zfs_unshare_002_pos', 'zfs_unshare_003_pos',
-    'zfs_unshare_004_neg', 'zfs_unshare_005_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_upgrade]
-tests = ['zfs_upgrade_001_pos', 'zfs_upgrade_002_pos', 'zfs_upgrade_003_pos',
-    'zfs_upgrade_004_pos', 'zfs_upgrade_005_pos', 'zfs_upgrade_006_neg',
-    'zfs_upgrade_007_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool]
-tests = ['zpool_001_neg', 'zpool_002_pos', 'zpool_003_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_add]
-tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos',
-    'zpool_add_004_pos', 'zpool_add_005_pos', 'zpool_add_006_pos',
-    'zpool_add_007_neg', 'zpool_add_008_neg', 'zpool_add_009_neg',
-    'zpool_add_010_pos',
-    'add_nested_replacing_spare', 'add-o_ashift', 'add_prop_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_attach]
-tests = ['zpool_attach_001_neg', 'attach-o_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_clear]
-tests = ['zpool_clear_001_pos', 'zpool_clear_002_neg', 'zpool_clear_003_neg',
-    'zpool_clear_readonly']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_create]
-tests = ['zpool_create_001_pos', 'zpool_create_002_pos',
-    'zpool_create_003_pos', 'zpool_create_004_pos', 'zpool_create_005_pos',
-    'zpool_create_006_pos', 'zpool_create_007_neg', 'zpool_create_008_pos',
-    'zpool_create_009_neg', 'zpool_create_010_neg', 'zpool_create_011_neg',
-    'zpool_create_012_neg', 'zpool_create_014_neg',
-    'zpool_create_015_neg', 'zpool_create_016_pos', 'zpool_create_017_neg',
-    'zpool_create_018_pos', 'zpool_create_019_pos', 'zpool_create_020_pos',
-    'zpool_create_021_pos', 'zpool_create_022_pos', 'zpool_create_023_neg',
-    'zpool_create_024_pos',
-    'zpool_create_encrypted', 'zpool_create_crypt_combos',
-    'zpool_create_features_001_pos', 'zpool_create_features_002_pos',
-    'zpool_create_features_003_pos', 'zpool_create_features_004_neg',
-    'zpool_create_features_005_pos', 'zpool_create_tempname', 'create-o_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_destroy]
-tests = ['zpool_destroy_001_pos', 'zpool_destroy_002_pos',
-    'zpool_destroy_003_neg']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_detach]
-tests = ['zpool_detach_001_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_expand]
-tests = ['zpool_expand_001_pos', 'zpool_expand_002_pos',
-    'zpool_expand_003_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_export]
-tests = ['zpool_export_001_pos', 'zpool_export_002_pos',
-    'zpool_export_003_neg', 'zpool_export_004_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_get]
-tests = ['zpool_get_001_pos', 'zpool_get_002_pos', 'zpool_get_003_pos',
-    'zpool_get_004_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_history]
-tests = ['zpool_history_001_neg', 'zpool_history_002_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_import]
-tests = ['zpool_import_001_pos', 'zpool_import_002_pos',
-    'zpool_import_003_pos', 'zpool_import_004_pos', 'zpool_import_005_pos',
-    'zpool_import_006_pos', 'zpool_import_007_pos', 'zpool_import_008_pos',
-    'zpool_import_009_neg', 'zpool_import_010_pos', 'zpool_import_011_neg',
-    'zpool_import_012_pos', 'zpool_import_013_neg', 'zpool_import_014_pos',
-    'zpool_import_all_001_pos',
-    'zpool_import_features_001_pos', 'zpool_import_features_002_neg',
-    'zpool_import_features_003_pos', 'zpool_import_missing_001_pos',
-    'zpool_import_missing_002_pos', 'zpool_import_missing_003_pos',
-    'zpool_import_rename_001_pos',
-    'import_cachefile_device_added',
-    'import_cachefile_device_removed',
-    'import_cachefile_mirror_attached',
-    'import_cachefile_mirror_detached',
-    'import_cachefile_device_replaced',
-    'import_rewind_config_changed',
-    'import_cachefile_shared_device',
-    'import_paths_changed',
-    'import_devices_missing',
-    'zpool_import_encrypted', 'zpool_import_encrypted_load']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_labelclear]
-tests = ['zpool_labelclear_active', 'zpool_labelclear_exported',
-    'zpool_labelclear_removed', 'zpool_labelclear_valid']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_initialize]
-tests = ['zpool_initialize_attach_detach_add_remove',
-    'zpool_initialize_import_export',
-    'zpool_initialize_offline_export_import_online',
-    'zpool_initialize_online_offline',
-    'zpool_initialize_split',
-    'zpool_initialize_start_and_cancel_neg',
-    'zpool_initialize_start_and_cancel_pos',
-    'zpool_initialize_suspend_resume',
-    'zpool_initialize_unsupported_vdevs',
-    'zpool_initialize_verify_checksums',
-    'zpool_initialize_verify_initialized']
-pre =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_offline]
-tests = ['zpool_offline_001_pos', 'zpool_offline_002_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_online]
-tests = ['zpool_online_001_pos', 'zpool_online_002_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_remove]
-tests = ['zpool_remove_001_neg', 'zpool_remove_002_pos',
-    'zpool_remove_003_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_replace]
-tests = ['zpool_replace_001_neg', 'zpool_replace_002_neg', 'replace-o_ashift',
-    'replace_prop_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_resilver]
-tests = ['zpool_resilver_bad_args', 'zpool_resilver_restart']
-tags = ['functional', 'cli_root', 'zpool_resilver']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_scrub]
-tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos',
-    'zpool_scrub_004_pos', 'zpool_scrub_005_pos', 'zpool_scrub_print_repairing',
-    'zpool_scrub_offline_device', 'zpool_scrub_multiple_copies',
-    'zpool_scrub_encrypted_unloaded']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_set]
-tests = ['zpool_set_001_pos', 'zpool_set_002_neg', 'zpool_set_003_neg',
-    'zpool_set_ashift']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_status]
-tests = ['zpool_status_001_pos', 'zpool_status_002_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_sync]
-tests = ['zpool_sync_001_pos', 'zpool_sync_002_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_trim]
-tests = ['zpool_trim_attach_detach_add_remove',
-    'zpool_trim_import_export', 'zpool_trim_multiple', 'zpool_trim_neg',
-    'zpool_trim_offline_export_import_online', 'zpool_trim_online_offline',
-    'zpool_trim_partial', 'zpool_trim_rate', 'zpool_trim_rate_neg',
-    'zpool_trim_secure', 'zpool_trim_split', 'zpool_trim_start_and_cancel_neg',
-    'zpool_trim_start_and_cancel_pos', 'zpool_trim_suspend_resume',
-    'zpool_trim_unsupported_vdevs', 'zpool_trim_verify_checksums',
-    'zpool_trim_verify_trimmed']
-tags = ['functional', 'zpool_trim']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_upgrade]
-tests = ['zpool_upgrade_001_pos', 'zpool_upgrade_002_pos',
-    'zpool_upgrade_003_pos', 'zpool_upgrade_004_pos', 'zpool_upgrade_005_neg',
-    'zpool_upgrade_006_neg', 'zpool_upgrade_007_pos', 'zpool_upgrade_008_pos',
-    'zpool_upgrade_009_neg']
-
-[/opt/zfs-tests/tests/functional/cli_user/misc]
-tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
-    'zfs_clone_001_neg', 'zfs_create_001_neg', 'zfs_destroy_001_neg',
-    'zfs_get_001_neg', 'zfs_inherit_001_neg', 'zfs_mount_001_neg',
-    'zfs_promote_001_neg', 'zfs_receive_001_neg', 'zfs_rename_001_neg',
-    'zfs_rollback_001_neg', 'zfs_send_001_neg', 'zfs_set_001_neg',
-    'zfs_share_001_neg', 'zfs_snapshot_001_neg', 'zfs_unallow_001_neg',
-    'zfs_unmount_001_neg', 'zfs_unshare_001_neg', 'zfs_upgrade_001_neg',
-    'zpool_001_neg', 'zpool_add_001_neg', 'zpool_attach_001_neg',
-    'zpool_clear_001_neg', 'zpool_create_001_neg', 'zpool_destroy_001_neg',
-    'zpool_detach_001_neg', 'zpool_export_001_neg', 'zpool_get_001_neg',
-    'zpool_history_001_neg', 'zpool_import_001_neg', 'zpool_import_002_neg',
-    'zpool_offline_001_neg', 'zpool_online_001_neg', 'zpool_remove_001_neg',
-    'zpool_replace_001_neg', 'zpool_scrub_001_neg', 'zpool_set_001_neg',
-    'zpool_status_001_neg', 'zpool_upgrade_001_neg']
-user =
-
-[/opt/zfs-tests/tests/functional/cli_user/zfs_list]
-tests = ['zfs_list_001_pos', 'zfs_list_002_pos', 'zfs_list_003_pos',
-    'zfs_list_004_neg', 'zfs_list_007_pos', 'zfs_list_008_neg']
-user =
-
-[/opt/zfs-tests/tests/functional/cli_user/zpool_iostat]
-tests = ['zpool_iostat_001_neg', 'zpool_iostat_002_pos',
-    'zpool_iostat_003_neg', 'zpool_iostat_004_pos']
-user =
-
-[/opt/zfs-tests/tests/functional/cli_user/zpool_list]
-tests = ['zpool_list_001_pos', 'zpool_list_002_neg']
-user =
-
-[/opt/zfs-tests/tests/functional/compression]
-tests = ['compress_001_pos', 'compress_002_pos', 'compress_003_pos',
-    'compress_004_pos', 'l2arc_compressed_arc', 'l2arc_compressed_arc_disabled']
-
-[/opt/zfs-tests/tests/functional/ctime]
-tests = ['ctime_001_pos' ]
-
-[/opt/zfs-tests/tests/functional/delegate]
-tests = ['zfs_allow_001_pos', 'zfs_allow_002_pos',
-    'zfs_allow_004_pos', 'zfs_allow_005_pos', 'zfs_allow_006_pos',
-    'zfs_allow_007_pos', 'zfs_allow_008_pos', 'zfs_allow_009_neg',
-    'zfs_allow_010_pos', 'zfs_allow_011_neg', 'zfs_allow_012_neg',
-    'zfs_unallow_001_pos', 'zfs_unallow_002_pos', 'zfs_unallow_003_pos',
-    'zfs_unallow_004_pos', 'zfs_unallow_005_pos', 'zfs_unallow_006_pos',
-    'zfs_unallow_007_neg', 'zfs_unallow_008_neg']
-
-[/opt/zfs-tests/tests/functional/devices]
-tests = ['devices_001_pos', 'devices_002_neg', 'devices_003_pos']
-
-[/opt/zfs-tests/tests/functional/exec]
-tests = ['exec_001_pos', 'exec_002_neg']
-
-[/opt/zfs-tests/tests/functional/features/async_destroy]
-tests = ['async_destroy_001_pos']
-
-[/opt/zfs-tests/tests/functional/fault]
-tests = ['zpool_status_-s']
-
-[/opt/zfs-tests/tests/functional/grow_pool]
-tests = ['grow_pool_001_pos']
-
-[/opt/zfs-tests/tests/functional/grow_replicas]
-tests = ['grow_replicas_001_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/history]
-tests = ['history_001_pos', 'history_002_pos', 'history_003_pos',
-    'history_004_pos', 'history_005_neg', 'history_006_neg', 'history_007_pos',
-    'history_008_pos', 'history_009_pos', 'history_010_pos']
-
-[/opt/zfs-tests/tests/functional/holes]
-tests = ['holes_sanity']
-
-[/opt/zfs-tests/tests/functional/inheritance]
-tests = ['inherit_001_pos']
-pre =
-
-[/opt/zfs-tests/tests/functional/inuse]
-tests = ['inuse_001_pos', 'inuse_003_pos', 'inuse_004_pos',
-    'inuse_005_pos', 'inuse_006_pos', 'inuse_007_pos', 'inuse_008_pos',
-    'inuse_009_pos']
-post =
-
-[/opt/zfs-tests/tests/functional/large_dnode]
-tests = ['large_dnode_001_pos', 'large_dnode_003_pos',
-    'large_dnode_004_neg', 'large_dnode_005_pos', 'large_dnode_007_neg']
-
-[/opt/zfs-tests/tests/functional/large_files]
-tests = ['large_files_001_pos']
-
-[/opt/zfs-tests/tests/functional/largest_pool]
-tests = ['largest_pool_001_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/link_count]
-tests = ['link_count_001']
-
-[/opt/zfs-tests/tests/functional/mdb]
-tests = ['mdb_001_pos']
-
-[/opt/zfs-tests/tests/functional/migration]
-tests = ['migration_001_pos', 'migration_002_pos', 'migration_003_pos',
-    'migration_004_pos', 'migration_005_pos', 'migration_006_pos',
-    'migration_007_pos', 'migration_008_pos', 'migration_009_pos',
-    'migration_010_pos', 'migration_011_pos', 'migration_012_pos']
-
-[/opt/zfs-tests/tests/functional/mmap]
-tests = ['mmap_read_001_pos', 'mmap_write_001_pos']
-
-[/opt/zfs-tests/tests/functional/mmp]
-tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval',
-    'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import',
-    'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history',
-    'mmp_on_zdb']
-
-[/opt/zfs-tests/tests/functional/mount]
-tests = ['umount_001', 'umount_002', 'umountall_001']
-
-[/opt/zfs-tests/tests/functional/mv_files]
-tests = ['mv_files_001_pos', 'mv_files_002_pos']
-
-[/opt/zfs-tests/tests/functional/nestedfs]
-tests = ['nestedfs_001_pos']
-
-[/opt/zfs-tests/tests/functional/no_space]
-tests = ['enospc_001_pos', 'enospc_002_pos']
-
-[/opt/zfs-tests/tests/functional/nopwrite]
-tests = ['nopwrite_copies', 'nopwrite_mtime', 'nopwrite_negative',
-    'nopwrite_promoted_clone', 'nopwrite_recsize', 'nopwrite_sync',
-    'nopwrite_varying_compression', 'nopwrite_volume']
-
-[/opt/zfs-tests/tests/functional/online_offline]
-tests = ['online_offline_001_pos', 'online_offline_002_neg',
-    'online_offline_003_neg']
-
-[/opt/zfs-tests/tests/functional/pool_checkpoint]
-tests = ['checkpoint_after_rewind', 'checkpoint_big_rewind',
-    'checkpoint_capacity', 'checkpoint_conf_change', 'checkpoint_discard',
-    'checkpoint_discard_busy', 'checkpoint_discard_many',
-    'checkpoint_indirect', 'checkpoint_invalid', 'checkpoint_lun_expsz',
-    'checkpoint_open', 'checkpoint_removal', 'checkpoint_rewind',
-    'checkpoint_ro_rewind', 'checkpoint_sm_scale', 'checkpoint_twice',
-    'checkpoint_vdev_add', 'checkpoint_zdb', 'checkpoint_zhack_feat']
-
-[/opt/zfs-tests/tests/functional/pool_names]
-tests = ['pool_names_001_pos', 'pool_names_002_neg']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/poolversion]
-tests = ['poolversion_001_pos', 'poolversion_002_pos']
-
-[/opt/zfs-tests/tests/functional/privilege]
-tests = ['privilege_001_pos', 'privilege_002_pos']
-
-[/opt/zfs-tests/tests/functional/projectquota]
-tests = ['projectid_001_pos', 'projectid_002_pos', 'projectid_003_pos',
-    'projectquota_001_pos', 'projectquota_002_pos', 'projectquota_003_pos',
-    'projectquota_004_neg', 'projectquota_005_pos', 'projectquota_006_pos',
-    'projectquota_007_pos', 'projectquota_008_pos', 'projectquota_009_pos',
-    'projectspace_001_pos', 'projectspace_002_pos', 'projectspace_003_pos',
-    'projectspace_004_pos',
-    'projecttree_002_pos', 'projecttree_003_neg' ]
-
-[/opt/zfs-tests/tests/functional/quota]
-tests = ['quota_001_pos', 'quota_002_pos', 'quota_003_pos', 'quota_004_pos',
-    'quota_005_pos', 'quota_006_neg']
-
-[/opt/zfs-tests/tests/functional/raidz]
-tests = ['raidz_001_neg', 'raidz_002_pos']
-
-[/opt/zfs-tests/tests/functional/redundancy]
-tests = ['redundancy_001_pos', 'redundancy_002_pos', 'redundancy_003_pos',
-    'redundancy_004_neg']
-
-[/opt/zfs-tests/tests/functional/refquota]
-tests = ['refquota_001_pos', 'refquota_002_pos', 'refquota_003_pos',
-    'refquota_004_pos', 'refquota_005_pos', 'refquota_006_neg']
-
-[/opt/zfs-tests/tests/functional/refreserv]
-tests = ['refreserv_001_pos', 'refreserv_002_pos', 'refreserv_003_pos',
-    'refreserv_004_pos', 'refreserv_005_pos', 'refreserv_raidz',
-    'refreserv_multi_raidz']
-
-[/opt/zfs-tests/tests/functional/removal]
-pre =
-tests = ['removal_sanity', 'removal_all_vdev', 'removal_check_space',
-    'removal_condense_export',
-    'removal_multiple_indirection', 'removal_remap',
-    'removal_remap_deadlists',
-    'removal_with_add', 'removal_with_create_fs', 'removal_with_dedup',
-    'removal_with_export', 'removal_with_ganging', 'removal_with_remap',
-    'removal_with_remove', 'removal_with_scrub', 'removal_with_send',
-    'removal_with_send_recv', 'removal_with_snapshot', 'removal_with_write',
-    'removal_with_zdb', 'removal_resume_export',
-    'remove_mirror', 'remove_mirror_sanity', 'remove_raidz']
-
-[/opt/zfs-tests/tests/functional/rename_dirs]
-tests = ['rename_dirs_001_pos']
-
-[/opt/zfs-tests/tests/functional/replacement]
-tests = ['replacement_001_pos', 'replacement_002_pos']
-
-[/opt/zfs-tests/tests/functional/reservation]
-tests = ['reservation_001_pos', 'reservation_002_pos', 'reservation_003_pos',
-    'reservation_004_pos', 'reservation_005_pos', 'reservation_006_pos',
-    'reservation_007_pos', 'reservation_008_pos', 'reservation_009_pos',
-    'reservation_010_pos', 'reservation_011_pos', 'reservation_012_pos',
-    'reservation_013_pos', 'reservation_014_pos', 'reservation_015_pos',
-    'reservation_016_pos', 'reservation_017_pos', 'reservation_018_pos',
-    'reservation_019_pos', 'reservation_020_pos', 'reservation_021_neg',
-    'reservation_022_pos']
-
-[/opt/zfs-tests/tests/functional/rootpool]
-tests = ['rootpool_002_neg', 'rootpool_003_neg', 'rootpool_007_pos']
-
-[/opt/zfs-tests/tests/functional/rsend]
-tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos',
-    'rsend_005_pos', 'rsend_006_pos', 'rsend_007_pos', 'rsend_008_pos',
-    'rsend_009_pos', 'rsend_010_pos', 'rsend_011_pos', 'rsend_012_pos',
-    'rsend_013_pos', 'rsend_014_pos',
-    'rsend_019_pos', 'rsend_020_pos',
-    'rsend_021_pos', 'rsend_022_pos', 'rsend_024_pos',
-    'recv_secpolicy',
-    'send-c_verify_ratio', 'send-c_verify_contents', 'send-c_props',
-    'send-c_incremental', 'send-c_volume', 'send-c_zstreamdump',
-    'send-c_lz4_disabled', 'send-c_recv_lz4_disabled',
-    'send-c_mixed_compression', 'send-c_stream_size_estimate', 'send-cD',
-    'send-c_embedded_blocks', 'send-c_resume', 'send-cpL_varied_recsize',
-    'send-c_recv_dedup', 'send_encrypted_files', 'send_encrypted_hierarchy',
-    'send_encrypted_props', 'send_encrypted_truncated_files',
-    'send_realloc_files',
-    'send_realloc_encrypted_files', 'send_holds',
-    'send_mixed_raw', 'send-wDR_encrypted_zvol']
-
-[/opt/zfs-tests/tests/functional/scrub_mirror]
-tests = ['scrub_mirror_001_pos', 'scrub_mirror_002_pos',
-    'scrub_mirror_003_pos', 'scrub_mirror_004_pos']
-
-[/opt/zfs-tests/tests/functional/slog]
-tests = ['slog_001_pos', 'slog_002_pos', 'slog_003_pos', 'slog_004_pos',
-    'slog_005_pos', 'slog_006_pos', 'slog_007_pos', 'slog_008_neg',
-    'slog_009_neg', 'slog_010_neg', 'slog_011_neg', 'slog_012_neg',
-    'slog_013_pos', 'slog_014_pos', 'slog_replay_fs_001', 'slog_replay_fs_002']
-
-[/opt/zfs-tests/tests/functional/snapshot]
-tests = ['clone_001_pos', 'rollback_001_pos', 'rollback_002_pos',
-    'rollback_003_pos', 'snapshot_001_pos', 'snapshot_002_pos',
-    'snapshot_003_pos', 'snapshot_004_pos', 'snapshot_005_pos',
-    'snapshot_006_pos', 'snapshot_007_pos', 'snapshot_008_pos',
-    'snapshot_009_pos', 'snapshot_010_pos', 'snapshot_011_pos',
-    'snapshot_012_pos', 'snapshot_013_pos', 'snapshot_014_pos',
-    'snapshot_015_pos', 'snapshot_016_pos', 'snapshot_017_pos',
-    'deadlist_lock']
-
-[/opt/zfs-tests/tests/functional/snapused]
-tests = ['snapused_001_pos', 'snapused_002_pos', 'snapused_003_pos',
-    'snapused_004_pos', 'snapused_005_pos']
-
-[/opt/zfs-tests/tests/functional/sparse]
-tests = ['sparse_001_pos']
-
-[/opt/zfs-tests/tests/functional/threadsappend]
-tests = ['threadsappend_001_pos']
-
-[/opt/zfs-tests/tests/functional/trim]
-tests = ['autotrim_integrity', 'autotrim_config', 'autotrim_trim_integrity',
-    'trim_integrity', 'trim_config']
-tags = ['functional', 'trim']
-
-[/opt/zfs-tests/tests/functional/truncate]
-tests = ['truncate_001_pos', 'truncate_002_pos']
-
-[/opt/zfs-tests/tests/functional/upgrade]
-tests = ['upgrade_userobj_001_pos', 'upgrade_projectquota_001_pos',
-    'upgrade_readonly_pool']
-
-[/opt/zfs-tests/tests/functional/userquota]
-tests = [
-    'userquota_001_pos', 'userquota_002_pos', 'userquota_003_pos',
-    'userquota_004_pos', 'userquota_005_neg', 'userquota_006_pos',
-    'userquota_007_pos', 'userquota_008_pos', 'userquota_009_pos',
-    'userquota_010_pos', 'userquota_011_pos', 'userquota_012_neg',
-    'userquota_013_pos',
-    'userspace_001_pos', 'userspace_002_pos', 'userspace_003_pos',
-    'groupspace_001_pos', 'groupspace_002_pos', 'groupspace_003_pos' ]
-
-[/opt/zfs-tests/tests/functional/utils_test]
-tests = ['utils_test_001_pos', 'utils_test_002_pos', 'utils_test_003_pos',
-    'utils_test_004_pos', 'utils_test_005_pos', 'utils_test_006_pos',
-    'utils_test_007_pos', 'utils_test_008_pos', 'utils_test_009_pos']
-
-[/opt/zfs-tests/tests/functional/vdev_zaps]
-tests = ['vdev_zaps_001_pos', 'vdev_zaps_002_pos', 'vdev_zaps_003_pos',
-    'vdev_zaps_004_pos', 'vdev_zaps_005_pos', 'vdev_zaps_006_pos',
-    'vdev_zaps_007_pos']
-
-[/opt/zfs-tests/tests/functional/write_dirs]
-tests = ['write_dirs_001_pos', 'write_dirs_002_pos']
-
-[/opt/zfs-tests/tests/functional/xattr]
-tests = ['xattr_001_pos', 'xattr_002_neg', 'xattr_003_neg', 'xattr_004_pos',
-    'xattr_005_pos', 'xattr_006_pos', 'xattr_007_neg', 'xattr_008_pos',
-    'xattr_009_neg', 'xattr_010_neg', 'xattr_011_pos', 'xattr_012_pos',
-    'xattr_013_pos']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_ENOSPC]
-tests = ['zvol_ENOSPC_001_pos']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_cli]
-tests = ['zvol_cli_001_pos', 'zvol_cli_002_pos', 'zvol_cli_003_neg']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_dump]
-tests = ['zvol_dump_raidz']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_misc]
-tests = ['zvol_misc_001_neg', 'zvol_misc_002_pos', 'zvol_misc_003_neg',
-    'zvol_misc_004_pos', 'zvol_misc_005_neg', 'zvol_misc_006_pos']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_swap]
-tests = ['zvol_swap_001_pos', 'zvol_swap_002_pos', 'zvol_swap_003_pos',
-    'zvol_swap_004_pos', 'zvol_swap_005_pos', 'zvol_swap_006_pos']
-
-[/opt/zfs-tests/tests/functional/libzfs]
-tests = ['many_fds', 'libzfs_input']
-
-[/opt/zfs-tests/tests/functional/log_spacemap]
-tests = ['log_spacemap_import_logs']
-pre =
-post =
-tags = ['functional', 'log_spacemap']
-
-[/opt/zfs-tests/tests/functional/l2arc]
-tests = ['l2arc_arcstats_pos', 'l2arc_mfuonly_pos',
-    'persist_l2arc_001_pos', 'persist_l2arc_002_pos',
-    'persist_l2arc_003_neg', 'persist_l2arc_004_pos', 'persist_l2arc_005_pos',
-    'persist_l2arc_006_pos', 'persist_l2arc_007_pos', 'persist_l2arc_008_pos']
-tags = ['functional', 'l2arc']
diff --git a/usr/src/test/zfs-tests/runfiles/smartos.run b/usr/src/test/zfs-tests/runfiles/smartos.run
index 03f28f1872..b0af07325e 100644
--- a/usr/src/test/zfs-tests/runfiles/smartos.run
+++ b/usr/src/test/zfs-tests/runfiles/smartos.run
@@ -22,633 +22,3 @@ timeout = 1800
 post_user = root
 post = cleanup
 outputdir = /var/tmp/test_results
-
-[/opt/zfs-tests/tests/functional/alloc_class]
-tests = ['alloc_class_001_pos', 'alloc_class_002_neg', 'alloc_class_003_pos',
-    'alloc_class_004_pos', 'alloc_class_005_pos', 'alloc_class_006_pos',
-    'alloc_class_007_pos', 'alloc_class_008_pos', 'alloc_class_009_pos',
-    'alloc_class_010_pos', 'alloc_class_011_neg', 'alloc_class_012_pos',
-    'alloc_class_013_pos']
-tags = ['functional', 'alloc_class']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_add]
-tests = ['zpool_add_010_pos', 'add-o_ashift', 'add_prop_ashift']
-
-[/opt/zfs-tests/tests/functional/atime]
-tests = ['atime_001_pos', 'atime_002_neg']
-
-[/opt/zfs-tests/tests/functional/bootfs]
-tests = ['bootfs_001_pos', 'bootfs_002_neg', 'bootfs_003_pos',
-    'bootfs_004_neg', 'bootfs_005_neg', 'bootfs_006_pos', 'bootfs_007_pos',
-    'bootfs_008_pos']
-
-[/opt/zfs-tests/tests/functional/cache]
-tests = ['cache_001_pos', 'cache_002_pos', 'cache_003_pos', 'cache_004_neg',
-    'cache_005_neg', 'cache_006_pos', 'cache_007_neg', 'cache_008_neg',
-    'cache_009_pos', 'cache_010_neg', 'cache_011_pos', 'cache_012_pos']
-
-[/opt/zfs-tests/tests/functional/cachefile]
-tests = ['cachefile_001_pos', 'cachefile_002_pos', 'cachefile_003_pos',
-    'cachefile_004_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/channel_program/lua_core]
-autotests = 1
-
-[/opt/zfs-tests/tests/functional/channel_program/synctask_core]
-autotests = 1
-
-[/opt/zfs-tests/tests/functional/checksum]
-tests = ['run_edonr_test', 'run_sha2_test', 'run_skein_test']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/clean_mirror]
-tests = [ 'clean_mirror_001_pos', 'clean_mirror_002_pos',
-    'clean_mirror_003_pos', 'clean_mirror_004_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zdb]
-tests = ['zdb_001_neg', 'zdb_002_pos', 'zdb_003_pos', 'zdb_004_pos',
-    'zdb_005_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs]
-tests = ['zfs_001_neg', 'zfs_002_pos', 'zfs_003_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_change-key]
-tests = ['zfs_change-key', 'zfs_change-key_child', 'zfs_change-key_format',
-    'zfs_change-key_inherit', 'zfs_change-key_load', 'zfs_change-key_location',
-    'zfs_change-key_pbkdf2iters', 'zfs_change-key_clones']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_clone]
-tests = ['zfs_clone_001_neg', 'zfs_clone_002_pos', 'zfs_clone_003_pos',
-    'zfs_clone_004_pos', 'zfs_clone_005_pos', 'zfs_clone_006_pos',
-    'zfs_clone_007_pos', 'zfs_clone_008_neg', 'zfs_clone_009_neg',
-    'zfs_clone_010_pos', 'zfs_clone_encrypted']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_copies]
-tests = ['zfs_copies_001_pos', 'zfs_copies_002_pos', 'zfs_copies_003_pos',
-    'zfs_copies_004_neg', 'zfs_copies_005_neg', 'zfs_copies_006_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_create]
-tests = ['zfs_create_001_pos', 'zfs_create_002_pos', 'zfs_create_003_pos',
-    'zfs_create_004_pos', 'zfs_create_005_pos', 'zfs_create_006_pos',
-    'zfs_create_007_pos', 'zfs_create_008_neg', 'zfs_create_009_neg',
-    'zfs_create_010_neg', 'zfs_create_011_pos', 'zfs_create_012_pos',
-    'zfs_create_013_pos', 'zfs_create_encrypted', 'zfs_create_crypt_combos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_destroy]
-tests = ['zfs_destroy_001_pos', 'zfs_destroy_002_pos', 'zfs_destroy_003_pos',
-    'zfs_destroy_004_pos', 'zfs_destroy_005_neg', 'zfs_destroy_006_neg',
-    'zfs_destroy_007_neg', 'zfs_destroy_008_pos', 'zfs_destroy_009_pos',
-    'zfs_destroy_010_pos', 'zfs_destroy_011_pos', 'zfs_destroy_012_pos',
-    'zfs_destroy_013_neg', 'zfs_destroy_014_pos', 'zfs_destroy_015_pos',
-    'zfs_destroy_016_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_diff]
-tests = ['zfs_diff_changes', 'zfs_diff_cliargs', 'zfs_diff_timestamp',
-    'zfs_diff_types', 'zfs_diff_encrypted']
-tags = ['functional', 'cli_root', 'zfs_diff']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_get]
-tests = ['zfs_get_001_pos', 'zfs_get_002_pos', 'zfs_get_003_pos',
-    'zfs_get_004_pos', 'zfs_get_005_neg', 'zfs_get_006_neg', 'zfs_get_007_neg',
-    'zfs_get_008_pos', 'zfs_get_009_pos', 'zfs_get_010_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_inherit]
-tests = ['zfs_inherit_001_neg', 'zfs_inherit_002_neg', 'zfs_inherit_003_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_load-key]
-tests = ['zfs_load-key', 'zfs_load-key_all', 'zfs_load-key_file',
-    'zfs_load-key_location', 'zfs_load-key_noop', 'zfs_load-key_recursive']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_mount]
-tests = ['zfs_mount_001_pos', 'zfs_mount_002_pos', 'zfs_mount_003_pos',
-    'zfs_mount_004_pos', 'zfs_mount_005_pos', 'zfs_mount_006_pos',
-    'zfs_mount_007_pos', 'zfs_mount_008_pos', 'zfs_mount_009_neg',
-    'zfs_mount_010_neg', 'zfs_mount_011_neg', 'zfs_mount_012_neg',
-    'zfs_mount_all_001_pos', 'zfs_mount_all_fail', 'zfs_mount_all_mountpoints',
-    'zfs_mount_encrypted']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_program]
-tests = ['zfs_program_json']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_promote]
-tests = ['zfs_promote_001_pos', 'zfs_promote_002_pos', 'zfs_promote_003_pos',
-    'zfs_promote_004_pos', 'zfs_promote_005_pos', 'zfs_promote_006_neg',
-    'zfs_promote_007_neg', 'zfs_promote_008_pos', 'zfs_promote_encryptionroot']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_receive]
-tests = ['zfs_receive_001_pos', 'zfs_receive_002_pos', 'zfs_receive_003_pos',
-    'zfs_receive_005_neg', 'zfs_receive_006_pos',
-    'zfs_receive_007_neg', 'zfs_receive_008_pos', 'zfs_receive_009_neg',
-    'zfs_receive_010_pos', 'zfs_receive_011_pos', 'zfs_receive_012_pos',
-    'zfs_receive_013_pos', 'zfs_receive_014_pos', 'zfs_receive_015_pos',
-    'receive-o-x_props_override', 'zfs_receive_from_encrypted',
-    'zfs_receive_to_encrypted' 'zfs_receive_raw',
-    'zfs_receive_raw_incremental']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_remap]
-tests = ['zfs_remap_cliargs', 'zfs_remap_obsolete_counts']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_rename]
-tests = ['zfs_rename_001_pos', 'zfs_rename_002_pos', 'zfs_rename_003_pos',
-    'zfs_rename_004_neg', 'zfs_rename_005_neg', 'zfs_rename_006_pos',
-    'zfs_rename_007_pos', 'zfs_rename_008_pos', 'zfs_rename_009_neg',
-    'zfs_rename_010_neg', 'zfs_rename_011_pos', 'zfs_rename_012_neg',
-    'zfs_rename_013_pos', 'zfs_rename_014_neg', 'zfs_rename_encrypted_child',
-    'zfs_rename_to_encrypted']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_reservation]
-tests = ['zfs_reservation_001_pos', 'zfs_reservation_002_pos']
-
-[/opt/zfs-tests/tests/functional/resilver]
-tests = ['resilver_restart_001', 'resilver_restart_002']
-tags = ['functional', 'resilver']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_rollback]
-tests = ['zfs_rollback_001_pos', 'zfs_rollback_002_pos',
-    'zfs_rollback_003_neg', 'zfs_rollback_004_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_send]
-tests = ['zfs_send_001_pos', 'zfs_send_002_pos', 'zfs_send_003_pos',
-    'zfs_send_004_neg', 'zfs_send_005_pos', 'zfs_send_006_pos',
-    'zfs_send_007_pos', 'zfs_send_encrypted', 'zfs_send_raw',
-    'zfs_send-b']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_set]
-tests = ['cache_001_pos', 'cache_002_neg', 'canmount_001_pos',
-    'canmount_002_pos', 'canmount_003_pos', 'canmount_004_pos',
-    'checksum_001_pos', 'compression_001_pos', 'mountpoint_001_pos',
-    'mountpoint_002_pos', 'mountpoint_003_pos', 'onoffs_001_pos',
-    'property_alias_001_pos', 'readonly_001_pos', 'reservation_001_neg',
-    'ro_props_001_pos', 'share_mount_001_neg', 'snapdir_001_pos',
-    'user_property_001_pos', 'user_property_002_pos', 'user_property_003_neg',
-    'user_property_004_pos', 'version_001_neg', 'zfs_set_001_neg',
-    'zfs_set_002_neg', 'zfs_set_003_neg', 'zfs_set_keylocation']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_share]
-tests = ['zfs_share_001_pos', 'zfs_share_002_pos', 'zfs_share_003_pos',
-    'zfs_share_004_pos', 'zfs_share_005_pos', 'zfs_share_006_pos',
-    'zfs_share_007_neg', 'zfs_share_008_neg', 'zfs_share_009_neg',
-    'zfs_share_010_neg', 'zfs_share_011_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_snapshot]
-tests = ['zfs_snapshot_001_neg', 'zfs_snapshot_002_neg',
-    'zfs_snapshot_003_neg', 'zfs_snapshot_004_neg', 'zfs_snapshot_005_neg',
-    'zfs_snapshot_006_pos', 'zfs_snapshot_007_neg', 'zfs_snapshot_009_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unload-key]
-tests = ['zfs_unload-key', 'zfs_unload-key_all', 'zfs_unload-key_recursive']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unmount]
-tests = ['zfs_unmount_001_pos', 'zfs_unmount_002_pos', 'zfs_unmount_003_pos',
-    'zfs_unmount_004_pos', 'zfs_unmount_005_pos', 'zfs_unmount_006_pos',
-    'zfs_unmount_007_neg', 'zfs_unmount_008_neg', 'zfs_unmount_009_pos',
-    'zfs_unmount_all_001_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_unshare]
-tests = ['zfs_unshare_001_pos', 'zfs_unshare_002_pos', 'zfs_unshare_003_pos',
-    'zfs_unshare_004_neg', 'zfs_unshare_005_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zfs_upgrade]
-tests = ['zfs_upgrade_001_pos', 'zfs_upgrade_002_pos', 'zfs_upgrade_003_pos',
-    'zfs_upgrade_004_pos', 'zfs_upgrade_005_pos', 'zfs_upgrade_006_neg',
-    'zfs_upgrade_007_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool]
-tests = ['zpool_001_neg', 'zpool_002_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_add]
-tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos',
-    'zpool_add_004_pos', 'zpool_add_005_pos', 'zpool_add_006_pos',
-    'zpool_add_007_neg', 'zpool_add_008_neg', 'zpool_add_009_neg',
-    'add_nested_replacing_spare']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_attach]
-tests = ['zpool_attach_001_neg', 'attach-o_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_clear]
-tests = ['zpool_clear_001_pos', 'zpool_clear_002_neg', 'zpool_clear_003_neg',
-    'zpool_clear_readonly']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_create]
-tests = ['zpool_create_001_pos', 'zpool_create_002_pos',
-    'zpool_create_003_pos', 'zpool_create_004_pos', 'zpool_create_005_pos',
-    'zpool_create_006_pos', 'zpool_create_007_neg', 'zpool_create_008_pos',
-    'zpool_create_009_neg', 'zpool_create_010_neg', 'zpool_create_011_neg',
-    'zpool_create_012_neg', 'zpool_create_014_neg',
-    'zpool_create_015_neg', 'zpool_create_016_pos', 'zpool_create_017_neg',
-    'zpool_create_018_pos', 'zpool_create_019_pos', 'zpool_create_020_pos',
-    'zpool_create_021_pos', 'zpool_create_022_pos', 'zpool_create_023_neg',
-    'zpool_create_encrypted', 'zpool_create_crypt_combos',
-    'zpool_create_features_001_pos', 'zpool_create_features_002_pos',
-    'zpool_create_features_003_pos', 'zpool_create_features_004_neg',
-    'zpool_create_features_005_pos', 'zpool_create_tempname', 'create-o_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_destroy]
-tests = ['zpool_destroy_001_pos', 'zpool_destroy_002_pos',
-    'zpool_destroy_003_neg']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_detach]
-tests = ['zpool_detach_001_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_expand]
-tests = ['zpool_expand_002_pos', 'zpool_expand_003_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_export]
-tests = ['zpool_export_001_pos', 'zpool_export_002_pos',
-    'zpool_export_003_neg', 'zpool_export_004_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_get]
-tests = ['zpool_get_001_pos', 'zpool_get_002_pos', 'zpool_get_003_pos',
-    'zpool_get_004_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_history]
-tests = ['zpool_history_001_neg', 'zpool_history_002_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_import]
-tests = ['zpool_import_001_pos', 'zpool_import_002_pos',
-    'zpool_import_003_pos', 'zpool_import_004_pos', 'zpool_import_005_pos',
-    'zpool_import_006_pos', 'zpool_import_007_pos', 'zpool_import_008_pos',
-    'zpool_import_009_neg', 'zpool_import_010_pos', 'zpool_import_011_neg',
-    'zpool_import_012_pos', 'zpool_import_013_neg', 'zpool_import_014_pos',
-    'zpool_import_all_001_pos', 'zpool_import_missing_001_pos',
-    'zpool_import_missing_002_pos', 'zpool_import_missing_003_pos',
-    'zpool_import_rename_001_pos',
-    'import_cachefile_device_added',
-    'import_cachefile_device_removed',
-    'import_cachefile_mirror_attached',
-    'import_cachefile_mirror_detached',
-    'import_cachefile_device_replaced',
-    'import_paths_changed',
-    'zpool_import_encrypted', 'zpool_import_encrypted_load']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_labelclear]
-tests = ['zpool_labelclear_active', 'zpool_labelclear_exported',
-    'zpool_labelclear_removed', 'zpool_labelclear_valid']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_initialize]
-tests = ['zpool_initialize_attach_detach_add_remove',
-    'zpool_initialize_import_export',
-    'zpool_initialize_offline_export_import_online',
-    'zpool_initialize_online_offline',
-    'zpool_initialize_split',
-    'zpool_initialize_start_and_cancel_neg',
-    'zpool_initialize_start_and_cancel_pos',
-    'zpool_initialize_suspend_resume',
-    'zpool_initialize_unsupported_vdevs',
-    'zpool_initialize_verify_checksums']
-pre =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_offline]
-tests = ['zpool_offline_001_pos', 'zpool_offline_002_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_online]
-tests = ['zpool_online_001_pos', 'zpool_online_002_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_remove]
-tests = ['zpool_remove_001_neg', 'zpool_remove_002_pos',
-    'zpool_remove_003_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_replace]
-tests = ['zpool_replace_001_neg', 'zpool_replace_002_neg', 'replace-o_ashift',
-    'replace_prop_ashift']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_resilver]
-tests = ['zpool_resilver_bad_args', 'zpool_resilver_restart']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_scrub]
-tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos',
-    'zpool_scrub_004_pos', 'zpool_scrub_005_pos',
-    'zpool_scrub_encrypted_unloaded']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_set]
-tests = ['zpool_set_001_pos', 'zpool_set_002_neg', 'zpool_set_003_neg',
-    'zpool_set_ashift']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_status]
-tests = ['zpool_status_001_pos', 'zpool_status_002_pos']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_sync]
-tests = ['zpool_sync_001_pos', 'zpool_sync_002_neg']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_trim]
-tests = ['zpool_trim_attach_detach_add_remove',
-    'zpool_trim_import_export', 'zpool_trim_multiple', 'zpool_trim_neg',
-    'zpool_trim_offline_export_import_online', 'zpool_trim_online_offline',
-    'zpool_trim_partial', 'zpool_trim_rate', 'zpool_trim_rate_neg',
-    'zpool_trim_secure', 'zpool_trim_split', 'zpool_trim_start_and_cancel_neg',
-    'zpool_trim_start_and_cancel_pos', 'zpool_trim_suspend_resume',
-    'zpool_trim_unsupported_vdevs', 'zpool_trim_verify_checksums',
-    'zpool_trim_verify_trimmed']
-tags = ['functional', 'zpool_trim']
-
-[/opt/zfs-tests/tests/functional/cli_root/zpool_upgrade]
-tests = ['zpool_upgrade_001_pos', 'zpool_upgrade_002_pos',
-    'zpool_upgrade_003_pos', 'zpool_upgrade_004_pos', 'zpool_upgrade_005_neg',
-    'zpool_upgrade_006_neg', 'zpool_upgrade_007_pos', 'zpool_upgrade_008_pos',
-    'zpool_upgrade_009_neg']
-
-[/opt/zfs-tests/tests/functional/cli_user/misc]
-tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
-    'zfs_clone_001_neg', 'zfs_create_001_neg', 'zfs_destroy_001_neg',
-    'zfs_get_001_neg', 'zfs_inherit_001_neg', 'zfs_mount_001_neg',
-    'zfs_promote_001_neg', 'zfs_receive_001_neg', 'zfs_rename_001_neg',
-    'zfs_rollback_001_neg', 'zfs_send_001_neg', 'zfs_set_001_neg',
-    'zfs_share_001_neg', 'zfs_snapshot_001_neg', 'zfs_unallow_001_neg',
-    'zfs_unmount_001_neg', 'zfs_unshare_001_neg', 'zfs_upgrade_001_neg',
-    'zfs_channel_001_neg',
-    'zpool_001_neg', 'zpool_add_001_neg', 'zpool_attach_001_neg',
-    'zpool_clear_001_neg', 'zpool_create_001_neg', 'zpool_destroy_001_neg',
-    'zpool_detach_001_neg', 'zpool_export_001_neg', 'zpool_get_001_neg',
-    'zpool_history_001_neg', 'zpool_import_001_neg', 'zpool_import_002_neg',
-    'zpool_offline_001_neg', 'zpool_online_001_neg', 'zpool_remove_001_neg',
-    'zpool_replace_001_neg', 'zpool_scrub_001_neg', 'zpool_set_001_neg',
-    'zpool_status_001_neg', 'zpool_upgrade_001_neg']
-user =
-
-[/opt/zfs-tests/tests/functional/cli_user/zfs_list]
-tests = ['zfs_list_001_pos', 'zfs_list_002_pos', 'zfs_list_003_pos',
-    'zfs_list_004_neg', 'zfs_list_007_pos', 'zfs_list_008_neg']
-user =
-
-[/opt/zfs-tests/tests/functional/cli_user/zpool_iostat]
-tests = ['zpool_iostat_001_neg', 'zpool_iostat_002_pos',
-    'zpool_iostat_003_neg', 'zpool_iostat_004_pos']
-user =
-
-[/opt/zfs-tests/tests/functional/cli_user/zpool_list]
-tests = ['zpool_list_001_pos', 'zpool_list_002_neg']
-user =
-
-[/opt/zfs-tests/tests/functional/compression]
-tests = ['compress_001_pos', 'compress_002_pos', 'compress_003_pos',
-    'compress_004_pos', 'l2arc_compressed_arc', 'l2arc_compressed_arc_disabled']
-
-[/opt/zfs-tests/tests/functional/ctime]
-tests = ['ctime_001_pos' ]
-
-[/opt/zfs-tests/tests/functional/devices]
-tests = ['devices_003_pos']
-
-[/opt/zfs-tests/tests/functional/exec]
-tests = ['exec_001_pos', 'exec_002_neg']
-
-[/opt/zfs-tests/tests/functional/fault]
-tests = ['zpool_status_-s']
-
-[/opt/zfs-tests/tests/functional/features/async_destroy]
-tests = ['async_destroy_001_pos']
-
-[/opt/zfs-tests/tests/functional/grow_pool]
-tests = ['grow_pool_001_pos']
-
-[/opt/zfs-tests/tests/functional/grow_replicas]
-tests = ['grow_replicas_001_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/history]
-tests = ['history_001_pos', 'history_002_pos', 'history_003_pos',
-    'history_004_pos', 'history_005_neg', 'history_006_neg', 'history_007_pos',
-    'history_008_pos']
-
-[/opt/zfs-tests/tests/functional/holes]
-tests = ['holes_sanity']
-
-[/opt/zfs-tests/tests/functional/inuse]
-tests = ['inuse_001_pos', 'inuse_003_pos', 'inuse_004_pos',
-    'inuse_005_pos', 'inuse_006_pos', 'inuse_007_pos', 'inuse_008_pos',
-    'inuse_009_pos']
-post =
-
-[/opt/zfs-tests/tests/functional/large_dnode]
-tests = ['large_dnode_001_pos', 'large_dnode_003_pos',
-    'large_dnode_004_neg', 'large_dnode_005_pos', 'large_dnode_007_neg']
-
-[/opt/zfs-tests/tests/functional/large_files]
-tests = ['large_files_001_pos']
-
-[/opt/zfs-tests/tests/functional/largest_pool]
-tests = ['largest_pool_001_pos']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/link_count]
-tests = ['link_count_001']
-
-[/opt/zfs-tests/tests/functional/migration]
-tests = ['migration_001_pos', 'migration_002_pos', 'migration_003_pos',
-    'migration_004_pos', 'migration_005_pos', 'migration_006_pos',
-    'migration_007_pos', 'migration_008_pos', 'migration_009_pos',
-    'migration_010_pos', 'migration_011_pos', 'migration_012_pos']
-
-[/opt/zfs-tests/tests/functional/mmap]
-tests = ['mmap_read_001_pos', 'mmap_write_001_pos']
-
-[/opt/zfs-tests/tests/functional/mmp]
-tests = ['mmp_on_thread', 'mmp_on_off', 'mmp_interval',
-    'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import',
-    'mmp_on_zdb']
-
-[/opt/zfs-tests/tests/functional/mount]
-tests = ['umount_001', 'umount_002', 'umountall_001']
-
-[/opt/zfs-tests/tests/functional/mv_files]
-tests = ['mv_files_001_pos', 'mv_files_002_pos']
-
-[/opt/zfs-tests/tests/functional/nestedfs]
-tests = ['nestedfs_001_pos']
-
-[/opt/zfs-tests/tests/functional/no_space]
-tests = ['enospc_001_pos']
-
-[/opt/zfs-tests/tests/functional/nopwrite]
-tests = ['nopwrite_copies', 'nopwrite_mtime', 'nopwrite_negative',
-    'nopwrite_promoted_clone', 'nopwrite_recsize', 'nopwrite_sync',
-    'nopwrite_varying_compression', 'nopwrite_volume']
-
-[/opt/zfs-tests/tests/functional/online_offline]
-tests = ['online_offline_001_pos', 'online_offline_002_neg',
-    'online_offline_003_neg']
-
-[/opt/zfs-tests/tests/functional/pool_checkpoint]
-tests = ['checkpoint_after_rewind', 'checkpoint_big_rewind',
-    'checkpoint_capacity', 'checkpoint_conf_change', 'checkpoint_discard',
-    'checkpoint_discard_busy', 'checkpoint_discard_many',
-    'checkpoint_indirect', 'checkpoint_invalid', 'checkpoint_lun_expsz',
-    'checkpoint_open', 'checkpoint_removal', 'checkpoint_rewind',
-    'checkpoint_ro_rewind', 'checkpoint_sm_scale', 'checkpoint_twice',
-    'checkpoint_vdev_add', 'checkpoint_zdb']
-
-[/opt/zfs-tests/tests/functional/pool_names]
-tests = ['pool_names_001_pos', 'pool_names_002_neg']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/poolversion]
-tests = ['poolversion_001_pos', 'poolversion_002_pos']
-
-[/opt/zfs-tests/tests/functional/projectquota]
-tests = ['projectid_001_pos', 'projectid_002_pos', 'projectid_003_pos',
-    'projectquota_001_pos', 'projectquota_002_pos', 'projectquota_003_pos',
-    'projectquota_004_neg', 'projectquota_005_pos', 'projectquota_006_pos',
-    'projectquota_007_pos', 'projectquota_008_pos', 'projectquota_009_pos',
-    'projectspace_001_pos', 'projectspace_002_pos', 'projectspace_003_pos',
-    'projectspace_004_pos',
-    'projecttree_002_pos', 'projecttree_003_neg' ]
-
-[/opt/zfs-tests/tests/functional/quota]
-tests = ['quota_001_pos', 'quota_002_pos', 'quota_003_pos', 'quota_004_pos',
-    'quota_005_pos', 'quota_006_neg']
-
-[/opt/zfs-tests/tests/functional/raidz]
-tests = ['raidz_001_neg', 'raidz_002_pos']
-
-[/opt/zfs-tests/tests/functional/refquota]
-tests = ['refquota_001_pos', 'refquota_002_pos', 'refquota_003_pos',
-    'refquota_004_pos', 'refquota_005_pos', 'refquota_006_neg']
-
-[/opt/zfs-tests/tests/functional/refreserv]
-tests = ['refreserv_001_pos', 'refreserv_002_pos', 'refreserv_003_pos',
-    'refreserv_005_pos', 'refreserv_raidz',
-    'refreserv_multi_raidz']
-
-[/opt/zfs-tests/tests/functional/rename_dirs]
-tests = ['rename_dirs_001_pos']
-
-[/opt/zfs-tests/tests/functional/replacement]
-tests = ['replacement_001_pos', 'replacement_002_pos']
-
-[/opt/zfs-tests/tests/functional/reservation]
-tests = ['reservation_001_pos', 'reservation_002_pos', 'reservation_003_pos',
-    'reservation_004_pos', 'reservation_005_pos', 'reservation_006_pos',
-    'reservation_007_pos', 'reservation_008_pos', 'reservation_009_pos',
-    'reservation_010_pos', 'reservation_011_pos', 'reservation_012_pos',
-    'reservation_013_pos', 'reservation_014_pos', 'reservation_015_pos',
-    'reservation_016_pos', 'reservation_017_pos', 'reservation_018_pos',
-    'reservation_019_pos', 'reservation_020_pos', 'reservation_021_neg',
-    'reservation_022_pos']
-
-[/opt/zfs-tests/tests/functional/rootpool]
-tests = ['rootpool_003_neg']
-
-[/opt/zfs-tests/tests/functional/rsend]
-tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos',
-    'rsend_005_pos', 'rsend_006_pos', 'rsend_007_pos',
-    'rsend_013_pos', 'rsend_014_pos',
-    'rsend_019_pos', 'rsend_020_pos',
-    'rsend_021_pos', 'rsend_022_pos', 'rsend_024_pos',
-    'recv_secpolicy',
-    'send-c_verify_ratio', 'send-c_verify_contents',
-    'send-c_incremental', 'send-cD',
-    'send-c_resume',
-    'send-c_recv_dedup', 'send_encrypted_files', 'send_encrypted_hierarchy',
-    'send_encrypted_props', 'send_encrypted_truncated_files',
-    'send_realloc_files',
-    'send_realloc_encrypted_files', 'send_holds',
-    'send_mixed_raw', 'send-wDR_encrypted_zvol']
-
-[/opt/zfs-tests/tests/functional/scrub_mirror]
-tests = ['scrub_mirror_001_pos', 'scrub_mirror_002_pos',
-    'scrub_mirror_003_pos', 'scrub_mirror_004_pos']
-
-[/opt/zfs-tests/tests/functional/slog]
-tests = ['slog_001_pos', 'slog_002_pos', 'slog_003_pos', 'slog_004_pos',
-    'slog_005_pos', 'slog_006_pos', 'slog_007_pos', 'slog_008_neg',
-    'slog_009_neg', 'slog_010_neg', 'slog_011_neg', 'slog_012_neg',
-    'slog_013_pos', 'slog_014_pos', 'slog_replay_fs_001', 'slog_replay_fs_002']
-
-[/opt/zfs-tests/tests/functional/snapshot]
-tests = ['clone_001_pos', 'rollback_001_pos', 'rollback_002_pos',
-    'rollback_003_pos', 'snapshot_001_pos', 'snapshot_002_pos',
-    'snapshot_003_pos', 'snapshot_004_pos', 'snapshot_005_pos',
-    'snapshot_006_pos', 'snapshot_007_pos',
-    'snapshot_009_pos', 'snapshot_010_pos', 'snapshot_011_pos',
-    'snapshot_012_pos', 'snapshot_013_pos', 'snapshot_014_pos',
-    'snapshot_015_pos', 'snapshot_016_pos', 'snapshot_017_pos',
-    'deadlist_lock']
-
-[/opt/zfs-tests/tests/functional/snapused]
-tests = ['snapused_001_pos', 'snapused_002_pos', 'snapused_003_pos',
-    'snapused_004_pos', 'snapused_005_pos']
-
-[/opt/zfs-tests/tests/functional/sparse]
-tests = ['sparse_001_pos']
-
-[/opt/zfs-tests/tests/functional/threadsappend]
-tests = ['threadsappend_001_pos']
-
-[/opt/zfs-tests/tests/functional/trim]
-tests = ['autotrim_integrity', 'autotrim_config', 'autotrim_trim_integrity',
-    'trim_integrity', 'trim_config']
-tags = ['functional', 'trim']
-
-[/opt/zfs-tests/tests/functional/truncate]
-tests = ['truncate_001_pos', 'truncate_002_pos']
-
-[/opt/zfs-tests/tests/functional/upgrade]
-tests = ['upgrade_userobj_001_pos', 'upgrade_projectquota_001_pos',
-    'upgrade_readonly_pool']
-
-[/opt/zfs-tests/tests/functional/userquota]
-tests = [
-    'userquota_001_pos', 'userquota_002_pos', 'userquota_003_pos',
-    'userquota_004_pos', 'userquota_005_neg', 'userquota_006_pos',
-    'userquota_007_pos', 'userquota_008_pos', 'userquota_009_pos',
-    'userquota_010_pos', 'userquota_011_pos', 'userquota_012_neg',
-    'userquota_013_pos',
-    'userspace_001_pos', 'userspace_002_pos', 'userspace_003_pos',
-    'groupspace_001_pos', 'groupspace_002_pos', 'groupspace_003_pos' ]
-
-[/opt/zfs-tests/tests/functional/utils_test]
-tests = ['utils_test_001_pos', 'utils_test_002_pos', 'utils_test_003_pos',
-    'utils_test_004_pos', 'utils_test_005_pos', 'utils_test_006_pos',
-    'utils_test_007_pos', 'utils_test_008_pos', 'utils_test_009_pos']
-
-[/opt/zfs-tests/tests/functional/vdev_zaps]
-tests = ['vdev_zaps_001_pos', 'vdev_zaps_002_pos', 'vdev_zaps_003_pos',
-    'vdev_zaps_004_pos', 'vdev_zaps_005_pos', 'vdev_zaps_006_pos']
-
-[/opt/zfs-tests/tests/functional/write_dirs]
-tests = ['write_dirs_001_pos', 'write_dirs_002_pos']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_ENOSPC]
-tests = ['zvol_ENOSPC_001_pos']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_cli]
-tests = ['zvol_cli_001_pos', 'zvol_cli_002_pos', 'zvol_cli_003_neg']
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_dump]
-tests = ['zvol_dump_raidz']
-pre =
-post =
-
-[/opt/zfs-tests/tests/functional/zvol/zvol_misc]
-tests = ['zvol_misc_001_neg', 'zvol_misc_002_pos', 'zvol_misc_003_neg',
-    'zvol_misc_004_pos', 'zvol_misc_005_neg', 'zvol_misc_006_pos']
-
-[/opt/zfs-tests/tests/functional/libzfs]
-tests = ['many_fds', 'libzfs_input']
-
-[/opt/zfs-tests/tests/functional/log_spacemap]
-tests = ['log_spacemap_import_logs']
-pre =
-post =
-tags = ['functional', 'log_spacemap']
-
-[/opt/zfs-tests/tests/functional/l2arc]
-tests = ['l2arc_arcstats_pos', 'l2arc_mfuonly_pos',
-    'persist_l2arc_001_pos', 'persist_l2arc_002_pos',
-    'persist_l2arc_003_neg', 'persist_l2arc_004_pos', 'persist_l2arc_005_pos',
-    'persist_l2arc_006_pos', 'persist_l2arc_007_pos', 'persist_l2arc_008_pos']
-tags = ['functional', 'l2arc']