diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8f03646250..1844e5c448 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-30  Jeff Holcomb  <jeffh@redhat.com>
+
+	* gdb.base/remote.c: Use a small buffer for targets with 16-bit
+	ints.
+
 2001-08-30  Keith Seitz  <keiths@redhat.com>
 
 	* lib/gdb.exp: Move all insight-related functionality into
diff --git a/gdb/testsuite/gdb.base/remote.c b/gdb/testsuite/gdb.base/remote.c
index e71c598ed6..a43c40bc9d 100644
--- a/gdb/testsuite/gdb.base/remote.c
+++ b/gdb/testsuite/gdb.base/remote.c
@@ -23,16 +23,16 @@ BEGIN {
 
 */
 
-#ifdef mc68hc11
+#include <limits.h>
+/* For targets with 16bit int, use a 1k buffer. */
+#if INT_MAX < 32768
 # define RANDOM_DATA_SIZE (1024)
-#endif
-
+#else
 /* Use a character buffer to avoid byte order problems. 48k is
    chosen so that the buffer required at least 3 16k packets but
    targets often have no more than 64k of data. */
 /* If you change this data, you will also have to change the checks
    for the data in remote.c */
-#ifndef RANDOM_DATA_SIZE
 # define RANDOM_DATA_SIZE (3 * 2048 * 8)
 # define BIG_RANDOM_DATA
 #endif