diff --git a/test/Jamfile b/test/Jamfile
index ecb7fa7b..7dc873a7 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -4,82 +4,60 @@ subproject libs/regex/test ;
 SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
 include testing.jam ;
 
-local test-dir = $(BOOST_ROOT)$(SLASH)libs$(SLASH)regex$(SLASH)test$(SLASH)regress$(SLASH) ;
-
-local test-files = $(test-dir)tests.txt
-  # dwa -- not sure if this is generally applicable
-  #  $(test-dir)test1252.txt
+template test 
+  : <lib>../build/boost_regex           # sources
+  : <define>BOOST_REGEX_NO_LIB=1        # requirements
+    <define>BOOST_REGEX_STATIC_LINK=1
+    <threading>multi
   ;
+ 
+template regression
+    : <template>test                    # sources
+      regress/parse.cpp
+      regress/regress.cpp 
+      regress/tests.cpp
+      <lib>../../test/build/boost_prg_exec_monitor
+    ;
 
-        test-suite regex
-        : [ run regress/parse.cpp regress/regress.cpp regress/tests.cpp
-                    <lib>../build/boost_regex 
-                    <lib>../../test/build/boost_prg_exec_monitor
-           : 
-                    $(test-files)
-           : 
-           : 
-                    <define>BOOST_REGEX_NO_LIB=1
-                    <define>BOOST_REGEX_STATIC_LINK=1
-                    <threading>multi
-           :
-                    regress ]
+rule regex-test ( name : sources + : requirements * : input-files * )
+{
+    return [ run $(sources) : : $(input-files) : $(requirements) : $(name) ] ;
+}
 
-            [ run regress/parse.cpp regress/regress.cpp regress/tests.cpp
-                    <lib>../build/boost_regex 
-                    <lib>../../test/build/boost_prg_exec_monitor
-            : 
-                    $(test-files)
-            : 
-            : 
-                    <define>BOOST_REGEX_NO_LIB=1
-                    <define>TEST_UNICODE=1
-                    <define>BOOST_REGEX_STATIC_LINK=1
-                    <threading>multi
-            :
-                    wregress ]
+test-suite regex
+      : 
+      [ regex-test regress
+          : <template>regression     # sources
+          :                          # requirements
+          : regress/tests.txt        # input files
+      ]
 
-            [ run c_compiler_checks/posix_api_check.c
-                    <lib>../build/boost_regex
-            : 
-            : 
-            : 
-                    <define>BOOST_REGEX_NO_LIB=1
-                    <define>BOOST_REGEX_STATIC_LINK=1
-                    <threading>multi
-            :
-                    posix_api_check_c ]
+      [ regex-test wregress
+          : <template>regression     # sources
+          : <define>TEST_UNICODE=1   # requirements
+          : regress/tests.txt        # input files
+      ]
 
-            [ run c_compiler_checks/wide_posix_api_check.c
-                    <lib>../build/boost_regex 
-            : 
-            : 
-            : 
-                    <define>BOOST_REGEX_NO_LIB=1
-                    <define>BOOST_REGEX_STATIC_LINK=1
-                    <threading>multi
-            :
-                    wide_posix_api_check_c ]
+      [ regex-test posix_api_check_c
+          : <template>test                      # sources
+            c_compiler_checks/posix_api_check.c
+      ]
 
-            [ run c_compiler_checks/posix_api_check.cpp
-                    <lib>../build/boost_regex 
-            : 
-            : 
-            :
-                    <define>BOOST_REGEX_NO_LIB=1
-                    <define>BOOST_REGEX_STATIC_LINK=1
-                    <threading>multi
-            ]
+      [ regex-test wide_posix_api_check_c
+          : <template>test                      # sources
+            c_compiler_checks/wide_posix_api_check.c
+      ]
+
+      [ regex-test posix_api_check
+          : <template>test                      # sources
+            c_compiler_checks/posix_api_check.cpp
+      ]
+
+      [ regex-test wide_posix_api_check
+          : <template>test                      # sources
+            c_compiler_checks/wide_posix_api_check.cpp
+      ]
 
-            [ run c_compiler_checks/wide_posix_api_check.cpp
-                    <lib>../build/boost_regex
-            : 
-            : 
-            : 
-                    <define>BOOST_REGEX_NO_LIB=1
-                    <define>BOOST_REGEX_STATIC_LINK=1
-                    <threading>multi
-            ]
 ;