Index: bin/cat/tests/Makefile
===================================================================
--- bin/cat/tests/Makefile
+++ bin/cat/tests/Makefile
@@ -6,8 +6,14 @@
 
 ${PACKAGE}FILES+=		d_align.in
 ${PACKAGE}FILES+=		d_align.out
-${PACKAGE}FILES+=		d_se_output.in
-${PACKAGE}FILES+=		d_se_output.out
+# Begin FreeBSD
+${PACKAGE}FILES+=		d_e_output.in
+${PACKAGE}FILES+=		d_e_output.out
+${PACKAGE}FILES+=		d_s_output.in
+${PACKAGE}FILES+=		d_s_output.out
+${PACKAGE}FILES+=		d_vt_output.in
+${PACKAGE}FILES+=		d_vt_output.out
+# End FreeBSD
 
 .include <netbsd-tests.test.mk>
 
Index: contrib/netbsd-tests/bin/cat/d_align.out
===================================================================
--- contrib/netbsd-tests/bin/cat/d_align.out
+++ contrib/netbsd-tests/bin/cat/d_align.out
@@ -1,5 +1,5 @@
-     1	a b c$
-      	$
-     2	1 2 3$
-      	$
-     3	x y z$
+     1	a b c
+
+     2	1 2 3
+
+     3	x y z
Index: contrib/netbsd-tests/bin/cat/d_s_output.in
===================================================================
--- /dev/null
+++ contrib/netbsd-tests/bin/cat/d_s_output.in
@@ -0,0 +1,6 @@
+a b c
+
+
+1 2 3
+
+x y z
Index: contrib/netbsd-tests/bin/cat/d_s_output.out
===================================================================
--- /dev/null
+++ contrib/netbsd-tests/bin/cat/d_s_output.out
@@ -0,0 +1,5 @@
+a b c
+
+1 2 3
+
+x y z
Index: contrib/netbsd-tests/bin/cat/d_se_output.in
===================================================================
--- /dev/null
+++ contrib/netbsd-tests/bin/cat/d_se_output.in
@@ -1,3 +0,0 @@
-
-Of course it runs NetBSD
-
Index: contrib/netbsd-tests/bin/cat/d_se_output.out
===================================================================
--- /dev/null
+++ contrib/netbsd-tests/bin/cat/d_se_output.out
@@ -1,3 +0,0 @@
-$
-Of course it runs NetBSD$
-$
Index: contrib/netbsd-tests/bin/cat/d_vt_output.out
===================================================================
--- /dev/null
+++ contrib/netbsd-tests/bin/cat/d_vt_output.out
@@ -0,0 +1,3 @@
+^I
+^X<BS>
+M-a
Index: contrib/netbsd-tests/bin/cat/t_cat.sh
===================================================================
--- contrib/netbsd-tests/bin/cat/t_cat.sh
+++ contrib/netbsd-tests/bin/cat/t_cat.sh
@@ -28,17 +28,18 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+# Begin FreeBSD
 atf_test_case align
 align_head() {
 	atf_set "descr" "Test that cat(1) aligns the output " \
-			"right with options '-be' (PR bin/4841)"
+			"right with option '-b' (PR bin/4841)"
 }
 
 align_body() {
-
 	atf_check -s ignore -o file:$(atf_get_srcdir)/d_align.out \
-		-x "cat -be $(atf_get_srcdir)/d_align.in"
+		cat -b $(atf_get_srcdir)/d_align.in
 }
+# End FreeBSD
 
 atf_test_case nonexistent
 nonexistent_head() {
@@ -46,26 +47,54 @@
 			"status for a nonexistent file (PR bin/3538)"
 }
 
+# Begin FreeBSD
 nonexistent_body() {
-
 	atf_check -s not-exit:0 -o empty -e not-empty \
-		-x "cat /some/name/that/does/not/exist"
+		cat /some/name/that/does/not/exist
 }
 
-atf_test_case se_output
-se_output_head() {
+atf_test_case e_output
+e_output_head() {
 	atf_set "descr" "Test that cat(1) prints a $ sign " \
-			"on blank lines with options '-se' (PR bin/51250)"
+			"on blank lines with option '-e' (PR bin/51250)"
+}
+
+e_output_body() {
+	atf_check -s ignore -o file:$(atf_get_srcdir)/d_e_output.out \
+		cat -e $(atf_get_srcdir)/d_e_output.in
+}
+
+atf_test_case s_output
+s_output_head() {
+	atf_set "descr" "Test that cat(1) squeezes multiple adjacent " \
+			"empty lines producing a single spaced output with option '-s'"
+}
+
+s_output_body() {
+	atf_check -s ignore -o file:$(atf_get_srcdir)/d_s_output.out \
+		cat -s $(atf_get_srcdir)/d_s_output.in
+}
+
+atf_test_case vt_output
+vt_output_head() {
+	atf_set "descr" "Test that cat(1) displays non-printing characters, " \
+			"namely control characters, tab character and meta-characters " \
+			"using options '-vt'"
 }
 
-se_output_body() {
-	atf_check -s ignore -o file:$(atf_get_srcdir)/d_se_output.out \
-		-x "cat -se $(atf_get_srcdir)/d_se_output.in"
+vt_output_body() {
+	atf_check -s ignore -o file:$(atf_get_srcdir)/d_vt_output.out \
+		cat -vt $(atf_get_srcdir)/d_vt_output.in
 }
+# End FreeBSD
 
 atf_init_test_cases()
 {
 	atf_add_test_case align
 	atf_add_test_case nonexistent
-	atf_add_test_case se_output
+# Begin FreeBSD
+	atf_add_test_case e_output
+	atf_add_test_case s_output
+	atf_add_test_case vt_output
+# End FreeBSD
 }