diff --git a/test/CXX/CXX-modules-fixture/SConstruct b/test/CXX/CXX-modules-fixture/SConstruct
index ce4352a95d..8cb4bcf976 100644
--- a/test/CXX/CXX-modules-fixture/SConstruct
+++ b/test/CXX/CXX-modules-fixture/SConstruct
@@ -1,4 +1,8 @@
 env = Environment()
+try:
+    env.Tool(ARGUMENTS["toolset"])
+except KeyError:
+    pass
 
 env.Append(CXXFLAGS = ["-std=c++20"])
 env['CXXMODULEPATH'] = "cxx-scons-modules"
diff --git a/test/CXX/CXXMODULES-gcc.py b/test/CXX/CXXMODULES-gcc.py
index 7bc7fa0373..6b0895217b 100644
--- a/test/CXX/CXXMODULES-gcc.py
+++ b/test/CXX/CXXMODULES-gcc.py
@@ -4,7 +4,7 @@
 
 test.dir_fixture("CXX-modules-fixture")
 
-test.run(arguments = ".")
+test.run(arguments = ". toolset=g++")
 
 test.pass_test()