diff --git a/usr.sbin/fstyp/tests/fstyp_test.sh b/usr.sbin/fstyp/tests/fstyp_test.sh
index 8f76424f5f75..3f524f297422 100755
--- a/usr.sbin/fstyp/tests/fstyp_test.sh
+++ b/usr.sbin/fstyp/tests/fstyp_test.sh
@@ -197,6 +197,9 @@ ufs1_head() {
 	atf_set "descr" "fstyp(8) should detect UFS version 1 filesystems"
 }
 ufs1_body() {
+	if [ "$(atf_config_get ci false)" = "true" ]; then
+		atf_skip "https://bugs.freebsd.org/247425"
+	fi
 	atf_check -s exit:0 mkdir dir
 	atf_check -s exit:0 -o ignore makefs -Z -s 64m ufs.img dir
 	atf_check -s exit:0 -o inline:"ufs\n" fstyp ufs.img
@@ -208,6 +211,9 @@ ufs2_head() {
 	atf_set "descr" "fstyp(8) should detect UFS version 2 filesystems"
 }
 ufs2_body() {
+	if [ "$(atf_config_get ci false)" = "true" ]; then
+		atf_skip "https://bugs.freebsd.org/247425"
+	fi
 	atf_check -s exit:0 mkdir dir
 	atf_check -s exit:0 -o ignore makefs -o version=2 -Z -s 64m ufs.img dir
 	atf_check -s exit:0 -o inline:"ufs\n" fstyp ufs.img
@@ -219,6 +225,9 @@ ufs2_label_head() {
 	atf_set "descr" "fstyp(8) can read the label on a UFS v2 filesystem"
 }
 ufs2_label_body() {
+	if [ "$(atf_config_get ci false)" = "true" ]; then
+		atf_skip "https://bugs.freebsd.org/247425"
+	fi
 	atf_check -s exit:0 mkdir dir
 	atf_check -s exit:0 -o ignore makefs -o version=2,label="foo" -Z -s 64m ufs.img dir
 	atf_check -s exit:0 -o inline:"ufs foo\n" fstyp -l ufs.img
diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh b/usr.sbin/makefs/tests/makefs_ffs_tests.sh
index 55be19f099eb..d0e0487767e1 100755
--- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh
@@ -106,6 +106,10 @@ D_flag_cleanup()
 atf_test_case F_flag cleanup
 F_flag_body()
 {
+	if [ "$(atf_config_get ci false)" = "true" ]; then
+		atf_skip "https://bugs.freebsd.org/247425"
+	fi
+
 	create_test_inputs
 
 	atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
@@ -125,6 +129,10 @@ F_flag_cleanup()
 atf_test_case from_mtree_spec_file cleanup
 from_mtree_spec_file_body()
 {
+	if [ "$(atf_config_get ci false)" = "true" ]; then
+		atf_skip "https://bugs.freebsd.org/247425"
+	fi
+
 	create_test_inputs
 
 	atf_check -e empty -o save:$TEST_SPEC_FILE -s exit:0 \
@@ -146,6 +154,10 @@ from_mtree_spec_file_cleanup()
 atf_test_case from_multiple_dirs cleanup
 from_multiple_dirs_body()
 {
+	if [ "$(atf_config_get ci false)" = "true" ]; then
+		atf_skip "https://bugs.freebsd.org/247425"
+	fi
+
 	test_inputs_dir2=$TMPDIR/inputs2
 
 	create_test_inputs
@@ -168,6 +180,10 @@ from_multiple_dirs_cleanup()
 atf_test_case from_single_dir cleanup
 from_single_dir_body()
 {
+	if [ "$(atf_config_get ci false)" = "true" ]; then
+		atf_skip "https://bugs.freebsd.org/247425"
+	fi
+
 	create_test_inputs
 
 	atf_check -e empty -o not-empty -s exit:0 \
@@ -184,6 +200,10 @@ from_single_dir_cleanup()
 atf_test_case o_flag_version_1 cleanup
 o_flag_version_1_body()
 {
+	if [ "$(atf_config_get ci false)" = "true" ]; then
+		atf_skip "https://bugs.freebsd.org/247425"
+	fi
+
 	ffs_version=1
 
 	platform=$(uname)
@@ -216,6 +236,10 @@ o_flag_version_1_cleanup()
 atf_test_case o_flag_version_2 cleanup
 o_flag_version_2_body()
 {
+	if [ "$(atf_config_get ci false)" = "true" ]; then
+		atf_skip "https://bugs.freebsd.org/247425"
+	fi
+
 	ffs_version=2
 
 	platform=$(uname)