diff --git a/pkgs/ffigen/test/native_cpp_test/verify_bindings_test.dart b/pkgs/ffigen/test/native_cpp_test/verify_bindings_test.dart
index 2d41d309c8..ada0264da5 100644
--- a/pkgs/ffigen/test/native_cpp_test/verify_bindings_test.dart
+++ b/pkgs/ffigen/test/native_cpp_test/verify_bindings_test.dart
@@ -98,25 +98,28 @@ void main() {
           ],
           compilerOptions: defaultCppCompilerOptions,
         ),
-        cpp: Cpp(
-          classes: CppClasses.includeSet({
-            'Shape',
-            'Drawable',
-            'Circle',
-            'ColoredCircle',
-            'Square',
-            'AccessBase',
-            'PublicDerived',
-            'ProtectedDerived',
-            'PrivateDerived',
-            'OverloadBase',
-            'OverloadDerived',
-            'DiamondBase',
-            'DiamondLeft',
-            'DiamondRight',
-            'DiamondDerived',
-          }),
-        ),
+        cpp: const Cpp(),
+        visitors: [
+          Visitor(
+            cppClass: (node) => node.isIncluded = {
+              'Shape',
+              'Drawable',
+              'Circle',
+              'ColoredCircle',
+              'Square',
+              'AccessBase',
+              'PublicDerived',
+              'ProtectedDerived',
+              'PrivateDerived',
+              'OverloadBase',
+              'OverloadDerived',
+              'DiamondBase',
+              'DiamondLeft',
+              'DiamondRight',
+              'DiamondDerived',
+            }.contains(node.originalName),
+          ),
+        ],
       ),
     };