@@ -34,10 +34,12 @@
 dir  path=opt/os-tests/bin
 file path=opt/os-tests/bin/ostest mode=0555
 dir  path=opt/os-tests/runfiles
 file path=opt/os-tests/runfiles/default.run mode=0444
 dir  path=opt/os-tests/tests
+file path=opt/os-tests/tests/OS-6097.32 mode=0555
+file path=opt/os-tests/tests/OS-6097.64 mode=0555
 file path=opt/os-tests/tests/clock_gettime.32 mode=0555
 file path=opt/os-tests/tests/clock_gettime.64 mode=0555
 dir  path=opt/os-tests/tests/cores
 $(i386_ONLY)dir path=opt/os-tests/tests/cores/amd64
 $(i386_ONLY)file path=opt/os-tests/tests/cores/amd64/libdumper.so.1 mode=0755

@@ -55,11 +57,10 @@
 file path=opt/os-tests/tests/definit/definit mode=0555
 file path=opt/os-tests/tests/definit/definit_test.32 mode=0555
 file path=opt/os-tests/tests/definit/definit_test.64 mode=0555
 file path=opt/os-tests/tests/definit/init.data mode=0444
 file path=opt/os-tests/tests/definit/init.expected mode=0444
-file path=opt/os-tests/tests/epoll_test mode=0555
 file path=opt/os-tests/tests/eventfd.32 mode=0555
 file path=opt/os-tests/tests/eventfd.64 mode=0555
 dir  path=opt/os-tests/tests/file-locking
 file path=opt/os-tests/tests/file-locking/acquire-lock.32 mode=0555
 file path=opt/os-tests/tests/file-locking/acquire-lock.64 mode=0555

@@ -69,10 +70,11 @@
 file path=opt/os-tests/tests/getcontext_extd.64 mode=0555
 $(i386_ONLY)dir path=opt/os-tests/tests/i386
 $(i386_ONLY)file path=opt/os-tests/tests/i386/badseg mode=0555
 $(i386_ONLY)file path=opt/os-tests/tests/i386/badseg_exec mode=0555
 $(i386_ONLY)file path=opt/os-tests/tests/i386/ldt mode=0555
+file path=opt/os-tests/tests/imc_test mode=0555
 $(i386_ONLY)file path=opt/os-tests/tests/imc_test mode=0555
 dir  path=opt/os-tests/tests/ksensor
 file path=opt/os-tests/tests/ksensor/ksensor_basic.32 mode=0555
 file path=opt/os-tests/tests/ksensor/ksensor_basic.64 mode=0555
 file path=opt/os-tests/tests/ksensor/ksensor_err.32 mode=0555

@@ -97,11 +99,13 @@
 file path=opt/os-tests/tests/pf_key/acquire-compare mode=0555
 file path=opt/os-tests/tests/pf_key/acquire-spray mode=0555
 file path=opt/os-tests/tests/pf_key/eacq-enabler mode=0555
 file path=opt/os-tests/tests/pf_key/kmc-update mode=0555
 file path=opt/os-tests/tests/pf_key/kmc-updater mode=0555
-file path=opt/os-tests/tests/poll_test mode=0555
+dir  path=opt/os-tests/tests/poll
+file path=opt/os-tests/tests/poll/epoll_test mode=0555
+file path=opt/os-tests/tests/poll/poll_test mode=0555
 dir  path=opt/os-tests/tests/portfs
 file path=opt/os-tests/tests/portfs/file_assoc.32 mode=0555
 file path=opt/os-tests/tests/portfs/file_assoc.64 mode=0555
 dir  path=opt/os-tests/tests/regression
 file path=opt/os-tests/tests/regression/illumos-15031 mode=0555