diff --git a/test/BoostBuild.py b/test/BoostBuild.py
index 4ce95c867..c6d7b1b88 100644
--- a/test/BoostBuild.py
+++ b/test/BoostBuild.py
@@ -205,6 +205,12 @@ class Tester(TestCmd.TestCmd):
         if not os.path.exists(self.workdir):
             os.mkdir(self.workdir)
         os.chdir(self.workdir)
+
+    def expand_toolset(self, name):
+        """Expands $toolset in the given file to tested toolset"""
+        content = self.read(name)
+        content = string.replace(content, "$toolset", self.toolset)
+        self.write(name, content)
                                                         
     #
     #   FIXME: Large portion copied from TestSCons.py, should be moved?
diff --git a/v2/test/BoostBuild.py b/v2/test/BoostBuild.py
index 4ce95c867..c6d7b1b88 100644
--- a/v2/test/BoostBuild.py
+++ b/v2/test/BoostBuild.py
@@ -205,6 +205,12 @@ class Tester(TestCmd.TestCmd):
         if not os.path.exists(self.workdir):
             os.mkdir(self.workdir)
         os.chdir(self.workdir)
+
+    def expand_toolset(self, name):
+        """Expands $toolset in the given file to tested toolset"""
+        content = self.read(name)
+        content = string.replace(content, "$toolset", self.toolset)
+        self.write(name, content)
                                                         
     #
     #   FIXME: Large portion copied from TestSCons.py, should be moved?