diff --git a/testsuite/bunzip2/bzcat-does-not-remove-compressed-file b/testsuite/bzcat/bzcat-does-not-remove-compressed-file
similarity index 100%
rename from testsuite/bunzip2/bzcat-does-not-remove-compressed-file
rename to testsuite/bzcat/bzcat-does-not-remove-compressed-file
diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index d44c95b10..88ec086b6 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
@@ -127,6 +127,7 @@ testing "cpio extracts in existing directory" \
 " "" ""
 SKIP=
 
+optional FEATURE_CPIO_O
 testing "cpio uses by default uid/gid" \
 "echo $0 | cpio -o -H newc | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
 "\
@@ -135,6 +136,7 @@ $user/$group
 " "" ""
 SKIP=
 
+optional FEATURE_CPIO_O
 testing "cpio -R with create" \
 "echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
 "\
@@ -143,6 +145,7 @@ testing "cpio -R with create" \
 " "" ""
 SKIP=
 
+optional FEATURE_CPIO_O
 testing "cpio -R with extract" \
 "echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
 "\
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index ffcbe9ba9..18883c966 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -299,7 +299,7 @@ l4/V8LDoe90yiWJhOJvIypgEfxdyRThQkBVn/bI=
 "
 SKIP=
 
-optional UNICODE_SUPPORT
+optional UNICODE_SUPPORT FEATURE_TAR_GNU_EXTENSIONS
 testing "Pax-encoded UTF8 names and symlinks" '\
 tar xvf ../tar.utf8.tar.bz2 2>&1; echo $?
 export LANG=en_US.UTF-8