diff --git a/src/gn/ffi/test_with_scope.h b/src/gn/ffi/test_with_scope.h
index 0fe2344..eb16e90 100644
--- a/src/gn/ffi/test_with_scope.h
+++ b/src/gn/ffi/test_with_scope.h
@@ -11,17 +11,17 @@
 #include "gn/scheduler.h"
 #include "gn/test_with_scope.h"
 
-struct TestWithScopeAndScheduler : public TestWithScope {
-  Scheduler scheduler;
-};
-
 inline std::unique_ptr<TestWithScope> NewTestWithScope() {
   if (!base::CommandLine::InitializedForCurrentProcess()) {
     int argc = 1;
     const char* argv[] = {"gn_rust_tests", nullptr};
     base::CommandLine::Init(argc, argv);
   }
-  return std::make_unique<TestWithScopeAndScheduler>();
+  // Initialize a single Scheduler instance that lives for the lifetime of the
+  // test process. This ensures g_scheduler is always set and never cleared
+  // between tests.
+  static Scheduler scheduler;
+  return std::make_unique<TestWithScope>();
 }
 
 #endif  // TOOLS_GN_FFI_TEST_WITH_SCOPE_H_