diff --git a/test/prebuilt/ext/jamfile2.jam b/test/prebuilt/ext/jamfile2.jam
index 2030b6465..dd79f4ea2 100644
--- a/test/prebuilt/ext/jamfile2.jam
+++ b/test/prebuilt/ext/jamfile2.jam
@@ -5,7 +5,7 @@ local dll-suffix = so ;
 local prefix = "" ;
 if [ modules.peek : OS ] in CYGWIN NT
 {
-   if $toolset = gcc
+   if [ MATCH ^(gcc) : $toolset ]
    {
       dll-suffix = dll ;
    }
@@ -18,7 +18,7 @@ else
 {
    prefix = "lib" ;      
 }
-if $toolset = darwin
+if [ MATCH ^(darwin) : $toolset ]
 {
    dll-suffix = dylib ;
 }
diff --git a/test/prebuilt/ext/jamfile3.jam b/test/prebuilt/ext/jamfile3.jam
index 868761cb5..f172a89d0 100644
--- a/test/prebuilt/ext/jamfile3.jam
+++ b/test/prebuilt/ext/jamfile3.jam
@@ -9,7 +9,7 @@ local dll-suffix = so ;
 local prefix = "" ;
 if [ modules.peek : OS ] in CYGWIN NT
 {
-   if $toolset = gcc
+   if [ MATCH ^(gcc) : $toolset ]
    {
       dll-suffix = dll ;
    }
@@ -22,7 +22,7 @@ else
 {
    prefix = "lib" ;      
 }
-if $toolset = darwin
+if [ MATCH ^(darwin) : $toolset ]
 {
    dll-suffix = dylib ;
 }