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-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-tape:2drive-incremental-tape "@regressdir@/tests/2drive-incremental-tape")
+ADD_TEST(all-non-root-tape:ansi-label-tape "@regressdir@/tests/ansi-label-tape")
+ADD_TEST(all-non-root-tape:backup-bacula-tape "@regressdir@/tests/backup-bacula-tape")
+ADD_TEST(all-non-root-tape:bscan-tape "@regressdir@/tests/bscan-tape")
+ADD_TEST(all-non-root-tape:fixed-block-size-tape "@regressdir@/tests/fixed-block-size-tape")
+ADD_TEST(all-non-root-tape:four-concurrent-jobs-tape "@regressdir@/tests/four-concurrent-jobs-tape")
+ADD_TEST(all-non-root-tape:four-jobs-tape "@regressdir@/tests/four-jobs-tape")
+ADD_TEST(all-non-root-tape:incremental-tape "@regressdir@/tests/incremental-tape")
+ADD_TEST(all-non-root-tape:relabel-tape "@regressdir@/tests/relabel-tape")
+ADD_TEST(all-non-root-tape:restore-by-file-tape "@regressdir@/tests/restore-by-file-tape")
+ADD_TEST(all-non-root-tape:small-file-size-tape "@regressdir@/tests/small-file-size-tape")
+ADD_TEST(all-non-root-tape:truncate-bug-tape "@regressdir@/tests/truncate-bug-tape")
+ADD_TEST(all-non-root-tape:two-pool-tape "@regressdir@/tests/two-pool-tape")
+ADD_TEST(all-non-root-tape:verify-vol-tape "@regressdir@/tests/verify-vol-tape")
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")