-ADD_TEST(all-non-root:2drive-3pool-test "@regressdir@/tests/2drive-3pool-test")
-ADD_TEST(all-non-root:2drive-concurrent-test "@regressdir@/tests/2drive-concurrent-test")
-ADD_TEST(all-non-root:2drive-incremental-2disk "@regressdir@/tests/2drive-incremental-2disk")
-ADD_TEST(all-non-root-2tape:incremental-2tape "@regressdir@/tests/incremental-2tape")
-ADD_TEST(all-non-root-2tape:two-volume-tape "@regressdir@/tests/two-volume-tape")
-ADD_TEST(all-non-root:accurate-test "@regressdir@/tests/accurate-test")
-ADD_TEST(all-non-root:auto-label-test "@regressdir@/tests/auto-label-test")
-ADD_TEST(all-non-root:backup-bacula-test "@regressdir@/tests/backup-bacula-test")
-ADD_TEST(all-non-root:backup-to-null "@regressdir@/tests/backup-to-null")
-ADD_TEST(all-non-root:bextract-test "@regressdir@/tests/bextract-test")
-ADD_TEST(all-non-root:big-vol-test "@regressdir@/tests/big-vol-test")
-ADD_TEST(all-non-root:bscan-test "@regressdir@/tests/bscan-test")
-ADD_TEST(all-non-root:bsr-opt-test "@regressdir@/tests/bsr-opt-test")
-ADD_TEST(all-non-root:compressed-test "@regressdir@/tests/compressed-test")
-ADD_TEST(all-non-root:compress-encrypt-test "@regressdir@/tests/compress-encrypt-test")
-ADD_TEST(all-non-root:concurrent-jobs-test "@regressdir@/tests/concurrent-jobs-test")
-ADD_TEST(all-non-root:data-encrypt-test "@regressdir@/tests/data-encrypt-test")
-ADD_TEST(all-non-root:differential-test "@regressdir@/tests/differential-test")
-ADD_TEST(all-non-root:encrypt-bug-test "@regressdir@/tests/encrypt-bug-test")
-ADD_TEST(all-non-root:fast-two-pool-test "@regressdir@/tests/fast-two-pool-test")
-ADD_TEST(all-non-root:fifo-test "@regressdir@/tests/fifo-test")
-ADD_TEST(all-non-root:four-concurrent-jobs-test "@regressdir@/tests/four-concurrent-jobs-test")
-ADD_TEST(all-non-root:four-jobs-test "@regressdir@/tests/four-jobs-test")
-ADD_TEST(all-non-root:hardlink-test "@regressdir@/tests/hardlink-test")
-ADD_TEST(all-non-root:incremental-2disk "@regressdir@/tests/incremental-2disk")
-ADD_TEST(all-non-root:incremental-2media "@regressdir@/tests/incremental-2media")
-ADD_TEST(all-non-root:incremental-test "@regressdir@/tests/incremental-test")
-ADD_TEST(all-non-root:maxvol2-test "@regressdir@/tests/maxvol2-test")
-ADD_TEST(all-non-root:maxvol-test "@regressdir@/tests/maxvol-test")
-ADD_TEST(all-non-root:migration-jobspan-test "@regressdir@/tests/migration-jobspan-test")
-ADD_TEST(all-non-root:migration-job-test "@regressdir@/tests/migration-job-test")
-ADD_TEST(all-non-root:migration-time-test "@regressdir@/tests/migration-time-test")
-ADD_TEST(all-non-root:migration-volume-test "@regressdir@/tests/migration-volume-test")
-ADD_TEST(all-non-root:query-test "@regressdir@/tests/query-test")
-ADD_TEST(all-non-root:recycle-test "@regressdir@/tests/recycle-test")
-ADD_TEST(all-non-root:regexwhere-test "@regressdir@/tests/regexwhere-test")
-ADD_TEST(all-non-root:restore2-by-file-test "@regressdir@/tests/restore2-by-file-test")
-ADD_TEST(all-non-root:restore-by-file-test "@regressdir@/tests/restore-by-file-test")
-ADD_TEST(all-non-root:restore-disk-seek-test "@regressdir@/tests/restore-disk-seek-test")
-ADD_TEST(all-non-root:scratch-pool-test "@regressdir@/tests/scratch-pool-test")
-ADD_TEST(all-non-root:six-vol-test "@regressdir@/tests/six-vol-test")
-ADD_TEST(all-non-root:span-vol-test "@regressdir@/tests/span-vol-test")
-ADD_TEST(all-non-root:sparse-compressed-test "@regressdir@/tests/sparse-compressed-test")
-ADD_TEST(all-non-root:sparse-test "@regressdir@/tests/sparse-test")
-ADD_TEST(all-non-root-tape:2drive-incremental-2t2da-tape "@regressdir@/tests/2drive-incremental-2t2da-tape")
-ADD_TEST(all-non-root-tape:ansi-label-1t1d-tape "@regressdir@/tests/ansi-label-1t1d-tape")
-ADD_TEST(all-non-root-tape:backup-bacula-1t1d-tape "@regressdir@/tests/backup-bacula-1t1d-tape")
-ADD_TEST(all-non-root-tape:bscan-1t1d-tape "@regressdir@/tests/bscan-1t1d-tape")
-ADD_TEST(all-non-root-tape:fixed-block-size-1t1d-tape "@regressdir@/tests/fixed-block-size-1t1d-tape")
-ADD_TEST(all-non-root-tape:four-concurrent-jobs-1t1d-tape "@regressdir@/tests/four-concurrent-jobs-1t1d-tape")
-ADD_TEST(all-non-root-tape:four-jobs-1t1d-tape "@regressdir@/tests/four-jobs-1t1d-tape")
-ADD_TEST(all-non-root-tape:incremental-1t1d-tape "@regressdir@/tests/incremental-1t1d-tape")
-ADD_TEST(all-non-root-tape:relabel-1t1d-tape "@regressdir@/tests/relabel-1t1d-tape")
-ADD_TEST(all-non-root-tape:restore-by-file-1t1d-tape "@regressdir@/tests/restore-by-file-1t1d-tape")
-ADD_TEST(all-non-root-tape:small-file-size-1t1d-tape "@regressdir@/tests/small-file-size-1t1d-tape")
-ADD_TEST(all-non-root-tape:truncate-bug-1t1d-tape "@regressdir@/tests/truncate-bug-1t1d-tape")
-ADD_TEST(all-non-root-tape:two-pool-2t1da-tape "@regressdir@/tests/two-pool-2t1da-tape")
-ADD_TEST(all-non-root-tape:verify-vol-1t1d-tape "@regressdir@/tests/verify-vol-1t1d-tape")
-ADD_TEST(all-non-root:three-pool-test "@regressdir@/tests/three-pool-test")
-ADD_TEST(all-non-root:tls-test "@regressdir@/tests/tls-test")
-ADD_TEST(all-non-root:two-jobs-test "@regressdir@/tests/two-jobs-test")
-ADD_TEST(all-non-root:two-pool-test "@regressdir@/tests/two-pool-test")
-ADD_TEST(all-non-root:two-vol-test "@regressdir@/tests/two-vol-test")
-ADD_TEST(all-non-root:two-volume-test "@regressdir@/tests/two-volume-test")
-ADD_TEST(all-non-root:verify-cat-test "@regressdir@/tests/verify-cat-test")
-ADD_TEST(all-non-root:verify-vol-test "@regressdir@/tests/verify-vol-test")
-ADD_TEST(all-non-root:weird-files2-test "@regressdir@/tests/weird-files2-test")
-ADD_TEST(all-non-root:weird-files-test "@regressdir@/tests/weird-files-test")
-ADD_TEST(all-root:dev-test-root "@regressdir@/tests/dev-test-root")
-ADD_TEST(all-root:etc-test-root "@regressdir@/tests/etc-test-root")
-ADD_TEST(all-root:lib-test-root "@regressdir@/tests/lib-test-root")
-ADD_TEST(all-root:usr-tape-root "@regressdir@/tests/usr-tape-root")
+
+
+ADD_TEST(disk:accurate-test "@regressdir@/tests/accurate-test")
+ADD_TEST(disk:auto-label-test "@regressdir@/tests/auto-label-test")
+ADD_TEST(disk:backup-bacula-test "@regressdir@/tests/backup-bacula-test")
+ADD_TEST(disk:backup-to-null "@regressdir@/tests/backup-to-null")
+ADD_TEST(disk:bextract-test "@regressdir@/tests/bextract-test")
+ADD_TEST(disk:big-fileset-test "@regressdir@/tests/big-fileset-test")
+ADD_TEST(disk:big-vol-test "@regressdir@/tests/big-vol-test")
+ADD_TEST(disk:bscan-test "@regressdir@/tests/bscan-test")
+ADD_TEST(disk:bsr-opt-test "@regressdir@/tests/bsr-opt-test")
+ADD_TEST(disk:compressed-test "@regressdir@/tests/compressed-test")
+ADD_TEST(disk:compress-encrypt-test "@regressdir@/tests/compress-encrypt-test")
+ADD_TEST(disk:concurrent-jobs-test "@regressdir@/tests/concurrent-jobs-test")
+ADD_TEST(disk:copy-jobspan-test "@regressdir@/tests/copy-jobspan-test")
+ADD_TEST(disk:copy-job-test "@regressdir@/tests/copy-job-test")
+ADD_TEST(disk:copy-uncopied-test "@regressdir@/tests/copy-uncopied-test")
+ADD_TEST(disk:copy-upgrade-test "@regressdir@/tests/copy-upgrade-test")
+ADD_TEST(disk:copy-volume-test "@regressdir@/tests/copy-volume-test")
+ADD_TEST(disk:data-encrypt-test "@regressdir@/tests/data-encrypt-test")
+ADD_TEST(disk:differential-test "@regressdir@/tests/differential-test")
+ADD_TEST(disk:encrypt-bug-test "@regressdir@/tests/encrypt-bug-test")
+ADD_TEST(disk:fast-two-pool-test "@regressdir@/tests/fast-two-pool-test")
+ADD_TEST(disk:fifo-test "@regressdir@/tests/fifo-test")
+ADD_TEST(disk:four-concurrent-jobs-test "@regressdir@/tests/four-concurrent-jobs-test")
+ADD_TEST(disk:four-jobs-test "@regressdir@/tests/four-jobs-test")
+ADD_TEST(disk:hardlink-test "@regressdir@/tests/hardlink-test")
+ADD_TEST(disk:incremental-2media "@regressdir@/tests/incremental-2media")
+ADD_TEST(disk:incremental-test "@regressdir@/tests/incremental-test")
+ADD_TEST(disk:maxtime-test "@regressdir@/tests/maxtime-test")
+SET_TESTS_PROPERTIES(disk:maxtime-test PROPERTIES
+ PASS_REGULAR_EXPRESSION "Fatal error")
+ADD_TEST(disk:maxvol2-test "@regressdir@/tests/maxvol2-test")
+ADD_TEST(disk:maxvol-test "@regressdir@/tests/maxvol-test")
+ADD_TEST(disk:migration-jobspan-test "@regressdir@/tests/migration-jobspan-test")
+ADD_TEST(disk:migration-job-test "@regressdir@/tests/migration-job-test")
+ADD_TEST(disk:migration-time-test "@regressdir@/tests/migration-time-test")
+ADD_TEST(disk:migration-volume-test "@regressdir@/tests/migration-volume-test")
+ADD_TEST(disk:query-test "@regressdir@/tests/query-test")
+ADD_TEST(disk:recycle-test "@regressdir@/tests/recycle-test")
+ADD_TEST(disk:regexwhere-test "@regressdir@/tests/regexwhere-test")
+ADD_TEST(disk:restore2-by-file-test "@regressdir@/tests/restore2-by-file-test")
+ADD_TEST(disk:restore-by-file-test "@regressdir@/tests/restore-by-file-test")
+ADD_TEST(disk:restore-disk-seek-test "@regressdir@/tests/restore-disk-seek-test")
+ADD_TEST(disk:runscript-test "@regressdir@/tests/runscript-test")
+ADD_TEST(disk:plugin-test "@regressdir@/tests/plugin-test")
+ADD_TEST(disk:scratch-pool-test "@regressdir@/tests/scratch-pool-test")
+ADD_TEST(disk:six-vol-test "@regressdir@/tests/six-vol-test")
+ADD_TEST(disk:span-vol-test "@regressdir@/tests/span-vol-test")
+ADD_TEST(disk:sparse-compressed-test "@regressdir@/tests/sparse-compressed-test")
+ADD_TEST(disk:sparse-test "@regressdir@/tests/sparse-test")
+ADD_TEST(disk:strip-test "@regressdir@/tests/strip-test")
+ADD_TEST(disk:2drive-3pool-test "@regressdir@/tests/2drive-3pool-test")
+ADD_TEST(disk:2drive-concurrent-test "@regressdir@/tests/2drive-concurrent-test")
+ADD_TEST(disk:2drive-incremental-2disk "@regressdir@/tests/2drive-incremental-2disk")
+ADD_TEST(disk:2drive-swap-test "@regressdir@/tests/2drive-swap-test")
+ADD_TEST(disk:2drive-2job-test "@regressdir@/tests/2drive-2job-test")
+ADD_TEST(disk:stats-test "@regressdir@/tests/stats-test")
+ADD_TEST(disk:three-pool-test "@regressdir@/tests/three-pool-test")
+ADD_TEST(disk:tls-test "@regressdir@/tests/tls-test")
+ADD_TEST(disk:two-jobs-test "@regressdir@/tests/two-jobs-test")
+ADD_TEST(disk:two-pool-test "@regressdir@/tests/two-pool-test")
+ADD_TEST(disk:two-vol-test "@regressdir@/tests/two-vol-test")
+ADD_TEST(disk:two-volume-test "@regressdir@/tests/two-volume-test")
+ADD_TEST(disk:verify-cat-test "@regressdir@/tests/verify-cat-test")
+ADD_TEST(disk:verify-vol-test "@regressdir@/tests/verify-vol-test")
+ADD_TEST(disk:virtual-changer-test "@regressdir@/tests/virtual-changer-test")
+ADD_TEST(disk:virtual-backup-test "@regressdir@/tests/virtual-backup-test")
+ADD_TEST(disk:virtual-backup2-test "@regressdir@/tests/virtual-backup2-test")
+ADD_TEST(disk:weird-files2-test "@regressdir@/tests/weird-files2-test")
+ADD_TEST(disk:weird-files-test "@regressdir@/tests/weird-files-test")
+ADD_TEST(disk:next-vol-test "@regressdir@/tests/next-vol-test")
+
+ADD_TEST(tape:ansi-label-tape "@regressdir@/tests/ansi-label-tape")
+ADD_TEST(tape:backup-bacula-tape "@regressdir@/tests/backup-bacula-tape")
+ADD_TEST(tape:bscan-tape "@regressdir@/tests/bscan-tape")
+ADD_TEST(tape:fixed-block-size-tape "@regressdir@/tests/fixed-block-size-tape")
+ADD_TEST(tape:four-concurrent-jobs-tape "@regressdir@/tests/four-concurrent-jobs-tape")
+ADD_TEST(tape:four-jobs-tape "@regressdir@/tests/four-jobs-tape")
+ADD_TEST(tape:incremental-tape "@regressdir@/tests/incremental-tape")
+ADD_TEST(tape:relabel-tape "@regressdir@/tests/relabel-tape")
+ADD_TEST(tape:restore-by-file-tape "@regressdir@/tests/restore-by-file-tape")
+ADD_TEST(tape:small-file-size-tape "@regressdir@/tests/small-file-size-tape")
+ADD_TEST(tape:truncate-bug-tape "@regressdir@/tests/truncate-bug-tape")
+ADD_TEST(tape:verify-vol-tape "@regressdir@/tests/verify-vol-tape")
+
+ADD_TEST(changer:incremental-changer "@regressdir@/tests/incremental-changer")
+ADD_TEST(changer:two-pool-changer "@regressdir@/tests/two-pool-changer")
+ADD_TEST(changer:two-volume-changer "@regressdir@/tests/two-volume-changer")
+# ADD_TEST(changer:manual-two-vol-tape "@regressdir@/tests/manual-two-vol-tape")
+ADD_TEST(changer:vol-duration-changer "@regressdir@/tests/vol-duration-changer")
+
+ADD_TEST(2drive-changer:2drive-incremental-changer "@regressdir@/tests/2drive-incremental-changer")
+
+ADD_TEST(root:dev-test-root "@regressdir@/tests/dev-test-root")
+ADD_TEST(root:etc-test-root "@regressdir@/tests/etc-test-root")
+ADD_TEST(root:lib-test-root "@regressdir@/tests/lib-test-root")
+ADD_TEST(root:usr-tape-root "@regressdir@/tests/usr-tape-root")
+
+ADD_TEST(win32-tape:backup-win32-tape "@regressdir@/tests/backup-win32-tape")
+ADD_TEST(win32-tape:win32-backup-tape "@regressdir@/tests/win32-backup-tape")
+ADD_TEST(win32-tape:win32-to-linux-tape "@regressdir@/tests/win32-to-linux-tape")
+
+ADD_TEST(long-tape:eighty-simultaneous-jobs-tape "@regressdir@/tests/eighty-simultaneous-jobs-tape")
+ADD_TEST(long-tape:restore-seek-tape "@regressdir@/tests/restore-seek-tape")
+ADD_TEST(long-tape:eot-fail-tape "@regressdir@/tests/eot-fail-tape")
+
+ADD_TEST(weird-tape:incremental-2media-tape "@regressdir@/tests/incremental-2media-tape")
+ADD_TEST(valgrind:memory-bug-tape "@regressdir@/tests/memory-bug-tape")