diff --git a/test/regress/test_locale.cpp b/test/regress/test_locale.cpp
index ff06d632..c73329d5 100644
--- a/test/regress/test_locale.cpp
+++ b/test/regress/test_locale.cpp
@@ -153,9 +153,14 @@ void test_en_locale(const char* name, boost::uint32_t lcid)
 
 void test_en_locale()
 {
+   // VC6 seems to have problems with std::setlocale, I've never
+   // gotten to the bottem of this as the program runs fine under the
+   // debugger, but hangs when run from bjam:
+#if !BOOST_WORKAROUND(BOOST_MSVC_, <=1200)
    test_en_locale("en_US", 0x09 | 0x01 << 10);
    test_en_locale("en_UK", 0x09 | 0x02 << 10);
    test_en_locale("en", 0x09);
+#endif
 }