diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b6f186e385..b9df7403039 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-16  Paolo Carlini  <pcarlini@unitus.it>
+
+	* testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc: Fix
+	for systems with BUFSIZ != 8192.
+	* testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc: Ditto.
+	* testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc:
+	Minor tweaks.
+
 2003-06-16  Andreas Jaeger  <aj@suse.de>
 
 	* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Make
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
index 021a1c89d68..0f17624c58c 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
@@ -37,12 +37,12 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool 					test = true;
+  bool 				test = true;
 
   streamsize 			strmsz_1, strmsz_2, strmsz_3;
-  int 					i = 0, j = 0, k = 0;
   char carray1[13] = "";
   char carray2[8192] = "";
+  char buffer[8192] = "";
   int_type 			c1, c2, c3, c4;
   
   // streamsize sgetn(char_type *s, streamsize n)
@@ -52,7 +52,10 @@ void test05()
 
   // in 
   {
-    constraint_filebuf fb_01; 
+    constraint_filebuf fb_01;
+    // Need this since BUFSIZ is only guaranteed >= 255 and we want
+    // to trigger the same underflow situation everywhere.
+    fb_01.pubsetbuf(buffer, 8192);
     fb_01.open(name_01, ios_base::in);
     VERIFY( !fb_01.write_position() );
     strmsz_1 = fb_01.in_avail(); // 8261
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
index 432ed6cdab5..ff2663ef911 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
@@ -38,12 +38,12 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool 					test = true;
+  bool 				test = true;
 
   streamsize 			strmsz_1, strmsz_2, strmsz_3;
-  int 					i = 0, j = 0, k = 0;
   char carray1[13] = "";
   char carray2[8192] = "";
+  char buffer[8192] = "";
   int_type 			c1, c2, c3, c4;
   
   // streamsize sgetn(char_type *s, streamsize n)
@@ -65,7 +65,10 @@ void test05()
 
   // in | out 2
   {
-    constraint_filebuf fb_01; 
+    constraint_filebuf fb_01;
+    // Need this since BUFSIZ is only guaranteed >= 255 and we want
+    // to trigger the same underflow situation everywhere.
+    fb_01.pubsetbuf(buffer, 8192);
     fb_01.open(name_01, ios_base::in | ios_base::out);
     VERIFY( fb_01.write_position() );
     strmsz_1 = fb_01.in_avail();
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
index dcefe01c6a1..7bd5e37e440 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-out.cc
@@ -37,10 +37,9 @@ void test05()
   typedef filebuf::int_type 	int_type;
   typedef filebuf::traits_type 	traits_type;
 
-  bool 					test = true;
+  bool 				test = true;
 
   streamsize 			strmsz_1, strmsz_2, strmsz_3;
-  int 					i = 0, j = 0, k = 0;
   char carray1[13] = "";
   char carray2[8192] = "";
   int_type 			c1, c2, c3, c4;
@@ -52,7 +51,7 @@ void test05()
 
   // out
   {
-    constraint_filebuf fb_02; 
+    constraint_filebuf fb_02;
     fb_02.open(name_02, ios_base::out | ios_base::trunc);
     VERIFY( fb_02.write_position() );
     VERIFY( !fb_02.read_position() );