diff --git a/contrib/netbsd-tests/fs/tmpfs/t_remove.sh b/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
index a0713f634dd5..78a6e2221aff 100755
--- a/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
+++ b/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
@@ -46,7 +46,18 @@ single_body() {
 	test_unmount
 }
 
+# Begin FreeBSD
+if true; then
+atf_test_case uchg cleanup
+uchg_cleanup() {
+	Mount_Point=$(pwd)/mntpt test_unmount || :
+}
+else
+# End FreeBSD
 atf_test_case uchg
+# Begin FreeBSD
+fi
+# End FreeBSD
 uchg_head() {
 	atf_set "descr" "Checks that files with the uchg flag set cannot" \
 	                "be removed"
@@ -54,7 +65,7 @@ uchg_head() {
 }
 uchg_body() {
 	# Begin FreeBSD
-	atf_skip "this fails on FreeBSD with root - bug 212861"
+	atf_expect_fail "this fails on FreeBSD with root - bug 212861"
 	# End FreeBSD
 
 	test_mount