diff --git a/CHANGES b/CHANGES
index 5bf601d6ed..5b4c195e46 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2302.	[bug]		Fix memset() calls in lib/tests/t_api.c. [RT #17472]
+
 2301.	[bug]		Remove resource leak and fix error messages in
 			bin/tests/system/lwresd/lwtest.c. [RT #17474]
 
diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c
index 8e5b919ab3..15763e9632 100644
--- a/lib/tests/t_api.c
+++ b/lib/tests/t_api.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: t_api.c,v 1.60 2007/06/19 23:47:23 tbox Exp $ */
+/* $Id: t_api.c,v 1.61 2008/01/14 12:43:35 marka Exp $ */
 
 /*! \file */
 
@@ -130,7 +130,7 @@ main(int argc, char **argv) {
 	/*
 	 * -a option is now default.
 	 */
-	memset(T_tvec, 0xffff, sizeof(T_tvec));
+	memset(T_tvec, 0xff, sizeof(T_tvec));
 
 	/*
 	 * Parse args.
@@ -141,7 +141,7 @@ main(int argc, char **argv) {
 			/*
 			 * Flag all tests to be run.
 			 */
-			memset(T_tvec, 0xffff, sizeof(T_tvec));
+			memset(T_tvec, 0xff, sizeof(T_tvec));
 		}
 		else if (c == 'b') {
 			T_dir = isc_commandline_argument;