diff --git a/contrib/one-true-awk/bugs-fixed/missing-precision.ok b/contrib/one-true-awk/bugs-fixed/missing-precision.ok
deleted file mode 100644
index 75e1e3d00446..000000000000
--- a/contrib/one-true-awk/bugs-fixed/missing-precision.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-../a.out: not enough args in printf(%*s)
- source line number 1
diff --git a/contrib/one-true-awk/bugs-fixed/negative-nf.ok b/contrib/one-true-awk/bugs-fixed/negative-nf.ok
deleted file mode 100644
index de97f8b27def..000000000000
--- a/contrib/one-true-awk/bugs-fixed/negative-nf.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-../a.out: cannot set NF to a negative value
- source line number 1
diff --git a/contrib/one-true-awk/bugs-fixed/pfile-overflow.ok b/contrib/one-true-awk/bugs-fixed/pfile-overflow.ok
deleted file mode 100644
index a0de50f9007f..000000000000
--- a/contrib/one-true-awk/bugs-fixed/pfile-overflow.ok
+++ /dev/null
@@ -1,4 +0,0 @@
-../a.out: syntax error at source line 1 source file pfile-overflow.awk
- context is
-	 >>>  <<< 
-../a.out: bailing out at source line 1 source file pfile-overflow.awk
diff --git a/contrib/one-true-awk/bugs-fixed/system-status.awk b/contrib/one-true-awk/bugs-fixed/system-status.awk
deleted file mode 100644
index 8daf563e6f4f..000000000000
--- a/contrib/one-true-awk/bugs-fixed/system-status.awk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Unmodified nawk prints the 16 bit exit status divided by 256, but
-# does so using floating point arithmetic, yielding strange results.
-#
-# The fix is to use the various macros defined for wait(2) and to
-# use the signal number + 256 for death by signal, or signal number + 512
-# for death by signal with core dump.
-
-BEGIN {
-	status = system("exit 42")
-	print "normal status", status
-
-	status = system("kill -HUP $$")
-	print "death by signal status", status
-
-	status = system("kill -ABRT $$")
-	print "death by signal with core dump status", status
-
-	system("rm -f core*")
-}
diff --git a/contrib/one-true-awk/bugs-fixed/system-status.bad b/contrib/one-true-awk/bugs-fixed/system-status.bad
deleted file mode 100644
index a1317dba54a8..000000000000
--- a/contrib/one-true-awk/bugs-fixed/system-status.bad
+++ /dev/null
@@ -1,3 +0,0 @@
-normal status 42
-death by signal status 0.00390625
-death by signal with core dump status 0.523438
diff --git a/contrib/one-true-awk/bugs-fixed/system-status.ok b/contrib/one-true-awk/bugs-fixed/system-status.ok
deleted file mode 100644
index 737828f5ed7a..000000000000
--- a/contrib/one-true-awk/bugs-fixed/system-status.ok
+++ /dev/null
@@ -1,3 +0,0 @@
-normal status 42
-death by signal status 257
-death by signal with core dump status 518
diff --git a/contrib/one-true-awk/bugs-fixed/system-status.ok2 b/contrib/one-true-awk/bugs-fixed/system-status.ok2
deleted file mode 100644
index f1f631e1cb33..000000000000
--- a/contrib/one-true-awk/bugs-fixed/system-status.ok2
+++ /dev/null
@@ -1,3 +0,0 @@
-normal status 42
-death by signal status 257
-death by signal with core dump status 262
diff --git a/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh b/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh
index 7c8cfa47f99e..588e2f86b0b7 100644
--- a/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh
+++ b/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh
@@ -1,74 +1,75 @@
 #
 # Copyright 2014 EMC Corp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 # * Redistributions of source code must retain the above copyright
 #   notice, this list of conditions and the following disclaimer.
 # * Redistributions in binary form must reproduce the above copyright
 #   notice, this list of conditions and the following disclaimer in the
 #   documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 # A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+export LANG=C.UTF-8
 SRCDIR=$(atf_get_srcdir)
 
 check()
 {
 	local tc=${1%.awk}; shift
 	local in_flag out_flag err_flag
 
 	awk=awk
 
 	local out_file="${SRCDIR}/${tc}.ok"
 	[ -f "${out_file}" ] && out_flag="-o file:${out_file}"
 	local err_file="${SRCDIR}/${tc}.err"
 	[ -f "${err_file}" ] && err_flag="-e file:${err_file} -s exit:2"
 	local in_file="${SRCDIR}/${tc}.in"
 	[ -f "${in_file}" ] && in_flag="${in_file}"
 
 	(cd ${SRCDIR} ; atf_check ${out_flag} ${err_flag} ${awk} -f "${tc}.awk" ${in_flag})
 }
 
 add_testcase()
 {
 	local tc=${1%.awk}
 	local tc_escaped word
 
 	case "${tc%.*}" in
 	*-*)
 		local IFS="-"
 		for word in ${tc}; do
 			tc_escaped="${tc_escaped:+${tc_escaped}_}${word}"
 		done
 		;;
 	*)
 		tc_escaped=${tc}
 		;;
 	esac
 
 	atf_test_case ${tc_escaped}
 	eval "${tc_escaped}_body() { check ${tc}; }"
 	atf_add_test_case ${tc_escaped}
 }
 
 atf_init_test_cases()
 {
 	for path in $(find -s "${SRCDIR}" -name '*.awk'); do
 		add_testcase ${path##*/}
 	done
 }