diff --git a/build/Jamfile b/build/Jamfile
index 668116dc..e094ff5e 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -30,10 +30,18 @@ rule check-icu-config ( )
          else if [ GLOB $(dir)$(SLASH)lib : icuuc.* ]
          {
             gICU_LIBS += <find-library>icuuc ;
+            if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
+            {
+               gICU_LIBS += <library-path>$(ICU_PATH)/lib ;
+            }
          }
          else if [ GLOB $(dir)$(SLASH)lib : libicuuc.* ]
          {
             gICU_LIBS += <find-library>icuuc ;
+            if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
+            {
+               gICU_LIBS += <library-path>$(ICU_PATH)/lib ;
+            }
          }
          else if [ GLOB $(ICU_PATH)/lib : cygicuuc.dll ]
          {
@@ -45,9 +53,12 @@ rule check-icu-config ( )
          }
          else
          {
-            ECHO ICU shared common library not found. ;
-            ECHO HINT: Set the environment variable ICU_LINK to contain ;
-            ECHO       the linker options required to link to ICU. ;
+            ECHO WARNING: ICU shared common library not found in path. ;
+            ECHO HINT:    If the regex library fails to link then try again ;
+            ECHO          with the environment variable ICU_LINK set to contain ;
+            ECHO          the linker options required to link to ICU. ;
+            ECHO          Defaulting to look for libicuuc ... ;
+            gICU_LIBS += <find-library>icuuc ;
          }
          
          if $(ICU_LINK)
@@ -57,10 +68,18 @@ rule check-icu-config ( )
          else if [ GLOB $(dir)$(SLASH)lib : icuin.* ]
          {
             gICU_LIBS += <find-library>icuin ;
+            if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
+            {
+               gICU_LIBS += <library-path>$(ICU_PATH)/lib ;
+            }
          }
          else if [ GLOB $(dir)$(SLASH)lib : libicui18n.* ]
          {
             gICU_LIBS += <find-library>icui18n ;
+            if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
+            {
+               gICU_LIBS += <library-path>$(ICU_PATH)/lib ;
+            }
          }
          else if [ GLOB $(ICU_PATH)/lib : cygicuin.dll ]
          {
@@ -75,6 +94,13 @@ rule check-icu-config ( )
             ECHO ICU shared i18n library not found. ;
             ECHO HINT: Set the environment variable ICU_LINK to contain ;
             ECHO       the linker options required to link to ICU. ;
+            
+            ECHO WARNING: ICU shared i18n library not found in path. ;
+            ECHO HINT:    If the regex library fails to link then try again ;
+            ECHO          with the environment variable ICU_LINK set to contain ;
+            ECHO          the linker options required to link to ICU. ;
+            ECHO          Defaulting to look for libicui18n ... ;
+            gICU_LIBS += <find-library>icui18n ;
          }
       }
       else
@@ -106,8 +132,11 @@ if [ check-icu-config ]
    }
    if $(ICU_PATH)
    {
-      BOOST_REGEX_ICU_OPTS += "<sysinclude>$(ICU_PATH)/include" ;
-      BOOST_REGEX_ICU_OPTS += "<library-path>$(ICU_PATH)/lib" ;
+      if ($(ICU_PATH) != /usr) && ($(ICU_PATH) != /usr/local)
+      {
+         BOOST_REGEX_ICU_OPTS += "<sysinclude>$(ICU_PATH)/include" ;
+      }
+      #BOOST_REGEX_ICU_OPTS += "<library-path>$(ICU_PATH)/lib" ;
    }
    # ECHO "BOOST_REGEX_ICU_OPTS =" $(BOOST_REGEX_ICU_OPTS) ;
 }
diff --git a/test/auto-link-test/Jamfile b/test/auto-link-test/Jamfile
index 11ff5c2e..c5bd9820 100644
--- a/test/auto-link-test/Jamfile
+++ b/test/auto-link-test/Jamfile
@@ -6,6 +6,32 @@
 # it is not generally applicable.
 #
 
+R_SOURCE = 
+basic_tests.cpp
+main.cpp
+test_alt.cpp
+test_anchors.cpp
+test_asserts.cpp
+test_backrefs.cpp
+test_deprecated.cpp
+test_emacs.cpp
+test_escapes.cpp
+test_grep.cpp
+test_locale.cpp
+test_mfc.cpp
+test_non_greedy_repeats.cpp
+test_perl_ex.cpp
+test_replace.cpp
+test_sets.cpp
+test_simple_repeats.cpp
+test_tricky_cases.cpp
+test_icu.cpp
+test_unicode.cpp
+test_overloads.cpp
+test_operators.cpp
+;
+
+
 subproject libs/regex/test/auto-link-test ;
 
 # bring in the rules for testing
@@ -14,10 +40,8 @@ import testing ;
 run 
    # sources
    <template>../../build/regex-options
-   ../regress/parse.cpp
-   ../regress/regress.cpp 
-   ../regress/tests.cpp
-   <lib>../../../test/build/boost_prg_exec_monitor
+   <template>../../build/regex-test-options
+   ../regress/$(R_SOURCE)
 :
 :  # input files
    ../regress/tests.txt
@@ -26,26 +50,6 @@ run
    <define>BOOST_LIB_DIAGNOSTIC=1
 :  # program name
    regex_regress
-          
-;
-
-run 
-   # sources
-   <template>../../build/regex-options
-   ../regress/parse.cpp
-   ../regress/regress.cpp 
-   ../regress/tests.cpp
-   <lib>../../../test/build/boost_prg_exec_monitor
-:
-:  # input files
-   ../regress/tests.txt
-:  # requirements
-   <library-path>../../../../stage/lib
-   <define>TEST_UNICODE=1
-   <define>BOOST_LIB_DIAGNOSTIC=1
-:  # program name
-   wide_regex_regress
-          
 ;
 
 # and now the dll versions:
@@ -53,10 +57,8 @@ run
 run 
    # sources
    <template>../../build/regex-options
-   ../regress/parse.cpp
-   ../regress/regress.cpp 
-   ../regress/tests.cpp
-   <lib>../../../test/build/boost_prg_exec_monitor
+   <template>../../build/regex-test-options
+   ../regress/$(R_SOURCE)
 :
 :  # input files
    ../regress/tests.txt
@@ -67,28 +69,9 @@ run
    <define>BOOST_LIB_DIAGNOSTIC=1
 :  # program name
    regex_regress_dll
-          
-;
-
-run 
-   # sources
-   <template>../../build/regex-options
-   ../regress/parse.cpp
-   ../regress/regress.cpp 
-   ../regress/tests.cpp
-   <lib>../../../test/build/boost_prg_exec_monitor
-:
-:  # input files
-   ../regress/tests.txt
-:  # requirements
-   <define>BOOST_ALL_DYN_LINK=1
-   <runtime-link>dynamic
-   <library-path>../../../../stage/lib
-   <define>TEST_UNICODE=1
-   <define>BOOST_LIB_DIAGNOSTIC=1
-:  # program name
-   wide_regex_regress_dll
-          
 ;
 
 
+
+
+