diff --git a/test/boost_has_pthread_ma_gt.cxx b/test/boost_has_pthread_ma_st.ipp
similarity index 84%
rename from test/boost_has_pthread_ma_gt.cxx
rename to test/boost_has_pthread_ma_st.ipp
index 27135e45..cd45dc22 100644
--- a/test/boost_has_pthread_ma_gt.cxx
+++ b/test/boost_has_pthread_ma_st.ipp
@@ -4,8 +4,8 @@
 //  warranty, and with no claim as to its suitability for any purpose.
 
 //  MACRO:         BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-//  TITLE:         pthread_mutexattr_gettype
-//  DESCRIPTION:   The platform supports POSIX API pthread_mutexattr_gettype.
+//  TITLE:         pthread_mutexattr_settype
+//  DESCRIPTION:   The platform supports POSIX API pthread_mutexattr_settype.
 
 #include <pthread.h>
 
@@ -17,8 +17,8 @@ void f()
     // this is never called, it just has to compile:
     pthread_mutexattr_t attr;
     pthread_mutexattr_init(&attr);
-    int type;
-    pthread_mutexattr_gettype(&attr, &type);
+    int type = 0;
+    pthread_mutexattr_settype(&attr, type);
 }
 
 int test()
diff --git a/test/boost_no_priv_aggregate.ipp b/test/boost_no_priv_aggregate.ipp
index 37f662bb..65927efe 100644
--- a/test/boost_no_priv_aggregate.ipp
+++ b/test/boost_no_priv_aggregate.ipp
@@ -17,7 +17,7 @@ struct t
 private:
    void foo(){ i = j; }
 public:
-   void bar(){ j = i; } // silences warning from GCC
+   void uncallable(); // silences warning from GCC
    int i;
    int j;
 };
diff --git a/test/config_test.cpp b/test/config_test.cpp
index 6011df8e..7feb89e0 100644
--- a/test/config_test.cpp
+++ b/test/config_test.cpp
@@ -10,7 +10,7 @@
 
 // Do not edit this file, it was generated automatically by
 // ../tools/generate from boost_*.cxx on
-// Wed Oct 31 12:19:39  2001
+// Tue Jan 29 08:44:30 EST 2002
 
 #include <boost/config.hpp>
 #define BOOST_INCLUDE_MAIN
@@ -272,6 +272,11 @@ namespace boost_has_pthread_delay_np = empty_boost;
 #else
 namespace boost_has_pthread_mutexattr_settype = empty_boost;
 #endif
+#ifdef BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
+#include "boost_has_pthread_ma_st.cxx"
+#else
+namespace boost_has_pthread_mutexattr_settype = empty_boost;
+#endif
 #ifdef BOOST_HAS_PTHREAD_YIELD
 #include "boost_has_pthread_yield.cxx"
 #else
@@ -381,6 +386,7 @@ int test_main( int, char *[] )
    BOOST_TEST(0 == boost_has_pthreads::test());
    BOOST_TEST(0 == boost_has_pthread_yield::test());
    BOOST_TEST(0 == boost_has_pthread_mutexattr_settype::test());
+   BOOST_TEST(0 == boost_has_pthread_mutexattr_settype::test());
    BOOST_TEST(0 == boost_has_pthread_delay_np::test());
    BOOST_TEST(0 == boost_has_nl_types_h::test());
    BOOST_TEST(0 == boost_has_nanosleep::test());
diff --git a/test/has_pthread_ma_gt_fail.cpp b/test/has_pthread_ma_st_fail.cpp
similarity index 84%
rename from test/has_pthread_ma_gt_fail.cpp
rename to test/has_pthread_ma_st_fail.cpp
index 07d87acc..bdf4951f 100644
--- a/test/has_pthread_ma_gt_fail.cpp
+++ b/test/has_pthread_ma_st_fail.cpp
@@ -7,11 +7,11 @@
 // Test file for macro BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
 // This file should not compile, if it does then
 // BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE may be defined.
-// see boost_has_pthread_ma_gt.cxx for more details
+// see boost_has_pthread_ma_st.cxx for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthread_ma_gt.cxx on
-// Thu Oct 11 12:24:39  2001
+// ../tools/generate from boost_has_pthread_ma_st.cxx on
+// Tue Jan 29 08:44:30 EST 2002
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,7 +24,7 @@
 #include "test.hpp"
 
 #ifndef BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-#include "boost_has_pthread_ma_gt.cxx"
+#include "boost_has_pthread_ma_st.cxx"
 #else
 #error "this file should not compile"
 #endif
diff --git a/test/has_pthread_ma_gt_pass.cpp b/test/has_pthread_ma_st_pass.cpp
similarity index 84%
rename from test/has_pthread_ma_gt_pass.cpp
rename to test/has_pthread_ma_st_pass.cpp
index d6327f2a..8b4d5207 100644
--- a/test/has_pthread_ma_gt_pass.cpp
+++ b/test/has_pthread_ma_st_pass.cpp
@@ -7,11 +7,11 @@
 // Test file for macro BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
 // This file should compile, if it does not then
 // BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE should not be defined.
-// see boost_has_pthread_ma_gt.cxx for more details
+// see boost_has_pthread_ma_st.cxx for more details
 
 // Do not edit this file, it was generated automatically by
-// ../tools/generate from boost_has_pthread_ma_gt.cxx on
-// Thu Oct 11 12:24:39  2001
+// ../tools/generate from boost_has_pthread_ma_st.cxx on
+// Tue Jan 29 08:44:30 EST 2002
 
 // Must not have BOOST_ASSERT_CONFIG set; it defeats
 // the objective of this file:
@@ -24,7 +24,7 @@
 #include "test.hpp"
 
 #ifdef BOOST_HAS_PTHREAD_MUTEXATTR_SETTYPE
-#include "boost_has_pthread_ma_gt.cxx"
+#include "boost_has_pthread_ma_st.cxx"
 #else
 namespace boost_has_pthread_mutexattr_settype = empty_boost;
 #endif
diff --git a/test/regression.cfg b/test/regression.cfg
index f0be64ae..345a39ff 100644
--- a/test/regression.cfg
+++ b/test/regression.cfg
@@ -107,6 +107,8 @@ run libs/config/test/has_pthread_delay_np_pass.cpp
 link-fail libs/config/test/has_pthread_delay_np_fail.cpp
 run libs/config/test/has_pthread_ma_gt_pass.cpp
 link-fail libs/config/test/has_pthread_ma_gt_fail.cpp
+run libs/config/test/has_pthread_ma_st_pass.cpp
+link-fail libs/config/test/has_pthread_ma_st_fail.cpp
 run libs/config/test/has_pthread_yield_pass.cpp
 link-fail libs/config/test/has_pthread_yield_fail.cpp
 run libs/config/test/has_pthreads_pass.cpp