diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c6bd64e6d1c80909539b60de6578660f611c603d..4db8a1328185dad90e7050d24c6d3626f87cb075 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-03  Paolo Carlini  <pcarlini@suse.de>
+
+	* testsuite/27_io/basic_stringstream/str/char/1.cc: Initialize vars.
+	* testsuite/27_io/basic_stringstream/str/wchar_t/1.cc: Likewise.
+	* testsuite/27_io/basic_istringstream/str/char/1.cc: Likewise, tidy.
+	* testsuite/27_io/basic_istringstream/str/wchar_t/1.cc: Likewise.
+
 2006-01-02  Mark Mitchell  <mark@codesourcery.com>
 
 	* src/Makefile.am (LTLDFLAGS): New variable. 
diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/1.cc
index ced7600be9f0b01b6a4c074b412cbc556a6e7287..e062c0c637fad3d060eeca111425ffefa3491a5a 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/char/1.cc
@@ -1,6 +1,7 @@
 // 2000-01-10 bkoz
 
-// Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -31,10 +32,9 @@ void test01()
   const std::string str01 = "123";
   std::string str02;
   const int i01 = 123;
-  int a,b;
+  int a = 0, b = 0;
 
-  std::ios_base::iostate state1, state2, statefail, stateeof;
-  statefail = std::ios_base::failbit;
+  std::ios_base::iostate state1, state2, stateeof;
   stateeof = std::ios_base::eofbit;
 
   // string str() const
diff --git a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/1.cc
index d0b90545da142eb6ff87213052fd176157f8655c..c231f1dd6d7736a4df1890f8e80f7091b42d7ac7 100644
--- a/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_istringstream/str/wchar_t/1.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -29,10 +29,9 @@ void test01()
   const std::wstring str01 = L"123";
   std::wstring str02;
   const int i01 = 123;
-  int a, b;
+  int a = 0, b = 0;
 
-  std::ios_base::iostate state1, state2, statefail, stateeof;
-  statefail = std::ios_base::failbit;
+  std::ios_base::iostate state1, state2, stateeof;
   stateeof = std::ios_base::eofbit;
 
   // string str() const
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/1.cc
index 37112cc8418ca795cf1fa3521c995a09a843f928..aaee938e67a48172cc102280d1323825be790295 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/char/1.cc
@@ -1,6 +1,7 @@
 // 2001-05-24 Benjamin Kosnik  <bkoz@redhat.com>
 
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+// Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -31,7 +32,7 @@ void test01()
   const std::string str01 = "123";
   std::string str02;
   const int i01 = 123;
-  int a,b;
+  int a = 0, b = 0;
 
   std::ios_base::iostate state1, state2, stateeof;
   stateeof = std::ios_base::eofbit;
diff --git a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/1.cc
index f5be647e71d1eebc7b9560b451be84aec79b8a27..d56345b51412f3008e10307840a295f6988f872d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_stringstream/str/wchar_t/1.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -29,7 +29,7 @@ void test01()
   const std::wstring str01 = L"123";
   std::wstring str02;
   const int i01 = 123;
-  int a,b;
+  int a = 0, b = 0;
 
   std::ios_base::iostate state1, state2, stateeof;
   stateeof = std::ios_base::eofbit;