diff --git a/UnitTest++/UnitTest++.forge b/UnitTest++/UnitTest++.forge
index c315d38..ab8e546 100644
--- a/UnitTest++/UnitTest++.forge
+++ b/UnitTest++/UnitTest++.forge
@@ -1,5 +1,5 @@
 
-for _, forge in forge:builds('cc.*') do
+for _, forge in toolsets('cc.*') do
     local forge = forge:inherit {
         warning_level = 0;
     };
diff --git a/tests/tests.forge b/tests/tests.forge
index f29eae4..8b2963a 100644
--- a/tests/tests.forge
+++ b/tests/tests.forge
@@ -1,35 +1,37 @@
 
-local forge = forge:build('cc.*'):inherit {
-    warning_level = 0;
-}
+for _, forge in toolsets('cc.*') do 
+    local forge = forge:inherit {
+        warning_level = 0;
+    };
 
-forge:all {
-    forge:Executable '${bin}/TestUnitTest++' {
-        '${lib}/UnitTest++_${architecture}';
+    forge:all {
+        forge:Executable '${bin}/TestUnitTest++' {
+            '${lib}/UnitTest++_${architecture}';
 
-        forge:Cxx '${obj}/%1' {
-            'Main.cpp',
-            'TestAssertHandler.cpp',
-            'TestCheckMacros.cpp',
-            'TestChecks.cpp',
-            'TestCompositeTestReporter.cpp',
-            'TestCurrentTest.cpp',
-            'TestDeferredTestReporter.cpp',
-            'TestExceptions.cpp',
-            'TestLongMacros.cpp',
-            'TestMemoryOutStream.cpp',
-            'TestRequireMacrosWithExceptionsOff.cpp',
-            'TestRequireMacrosWithExceptionsOn.cpp',
-            'TestTest.cpp',
-            'TestTestList.cpp',
-            'TestTestMacros.cpp',
-            'TestTestResults.cpp',
-            'TestTestRunner.cpp',
-            'TestTestSuite.cpp',
-            'TestTimeConstraint.cpp',
-            'TestTimeConstraintMacro.cpp',
-            'TestUnitTestPP.cpp',
-            'TestXmlTestReporter.cpp'
+            forge:Cxx '${obj}/%1' {
+                'Main.cpp',
+                'TestAssertHandler.cpp',
+                'TestCheckMacros.cpp',
+                'TestChecks.cpp',
+                'TestCompositeTestReporter.cpp',
+                'TestCurrentTest.cpp',
+                'TestDeferredTestReporter.cpp',
+                'TestExceptions.cpp',
+                'TestLongMacros.cpp',
+                'TestMemoryOutStream.cpp',
+                'TestRequireMacrosWithExceptionsOff.cpp',
+                'TestRequireMacrosWithExceptionsOn.cpp',
+                'TestTest.cpp',
+                'TestTestList.cpp',
+                'TestTestMacros.cpp',
+                'TestTestResults.cpp',
+                'TestTestRunner.cpp',
+                'TestTestSuite.cpp',
+                'TestTimeConstraint.cpp',
+                'TestTimeConstraintMacro.cpp',
+                'TestUnitTestPP.cpp',
+                'TestXmlTestReporter.cpp'
+            };
         };
     };
-};
+end