diff --git a/benchmark/many_seq_and_comb_benchmark.dart b/benchmark/many_seq_and_comb_benchmark.dart
index 569acfa02..49583be60 100644
--- a/benchmark/many_seq_and_comb_benchmark.dart
+++ b/benchmark/many_seq_and_comb_benchmark.dart
@@ -191,11 +191,6 @@ class ManySeqAndCombBenchmark extends AsyncBenchmarkBase {
   ManySeqAndCombBenchmark(this.combConnectionType)
       : super('ManySeqAndCombBenchmark_${combConnectionType.name}');
 
-  @override
-  Future<void> teardown() async {
-    await Simulator.reset();
-  }
-
   @override
   Future<void> run() async {
     final combinationalWrapper = _CombinationalWrapper(
diff --git a/test/ssa_test.dart b/test/ssa_test.dart
index a880a8e88..8ac1e4d70 100644
--- a/test/ssa_test.dart
+++ b/test/ssa_test.dart
@@ -366,15 +366,15 @@ void main() {
     ];
 
     // make sure we don't have any inferred latches (X's)
-    for (final signal in mod.signals) {
-      signal.changed.listen((event) {
-        expect(event.newValue.isValid, isTrue);
-      });
-    }
     Simulator.registerAction(15, () {
       for (final signal in mod.signals) {
         expect(signal.value.isValid, isTrue);
       }
+      for (final signal in mod.signals) {
+        signal.changed.listen((event) {
+          expect(event.newValue.isValid, isTrue);
+        });
+      }
     });
 
     await SimCompare.checkFunctionalVector(mod, vectors);
@@ -400,6 +400,11 @@ void main() {
       for (final signal in mod.signals) {
         expect(signal.value.isValid, isTrue);
       }
+      for (final signal in mod.signals) {
+        signal.changed.listen((event) {
+          expect(event.newValue.isValid, isTrue);
+        });
+      }
     });
 
     await SimCompare.checkFunctionalVector(mod, vectors);