+ 5,
+	    CLOSE_RANGE_CLOEXEC));
+	for (i = 1; i < 9; i++) {
+		require_fd_flag(start + i, "CLOSE_RANGE_CLOEXEC",
+		    "close-on-exec", FD_CLOEXEC, i >= 2 && i <= 5);
 	}
-	if (close_range(start, start + 8, 0) < 0)
-		fail_err("close_range");
-	ok("close_range(..., CLOSE_RANGE_CLOEXEC)");
+	ATF_REQUIRE_INTEQ(0, close_range(start + 1, start + 8, 0));
+}
 
-	return (0);
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, closefrom_simple);
+	ATF_TP_ADD_TC(tp, closefrom_with_holes);
+	ATF_TP_ADD_TC(tp, closefrom_zero);
+	ATF_TP_ADD_TC(tp, closefrom_negative_one);
+	ATF_TP_ADD_TC(tp, closefrom_in_holes);
+	ATF_TP_ADD_TC(tp, closerange_basic);
+	ATF_TP_ADD_TC(tp, closefrom_zero_twice);
+	ATF_TP_ADD_TC(tp, closerange_CLOEXEC);
+
+	return (atf_no_error());
 }