diff --git a/test/functional/feature_governance.py b/test/functional/feature_governance.py
index 826ba991ee4f76..d1dfa540fa2a16 100755
--- a/test/functional/feature_governance.py
+++ b/test/functional/feature_governance.py
@@ -91,13 +91,13 @@ def run_test(self):
         self.log.info("Check 1st superblock before v20")
         self.bump_mocktime(3)
         self.generate(self.nodes[0], 3, sync_fun=self.sync_blocks())
-        assert_equal(self.nodes[0].getblockcount(), 130)
+        assert_equal(self.nodes[0].getblockcount(), 137)
         assert_equal(self.nodes[0].getblockchaininfo()["softforks"]["v20"]["active"], False)
         self.check_superblockbudget(False)
 
         self.log.info("Check 2nd superblock before v20")
-        self.bump_mocktime(10)
-        self.generate(self.nodes[0], 10, sync_fun=self.sync_blocks())
+        self.bump_mocktime(3)
+        self.generate(self.nodes[0], 3, sync_fun=self.sync_blocks())
         assert_equal(self.nodes[0].getblockcount(), 140)
         assert_equal(self.nodes[0].getblockchaininfo()["softforks"]["v20"]["active"], False)
         self.check_superblockbudget(False)
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index f6f18257222ee3..82295828ff06d5 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -1521,8 +1521,9 @@ def setup_network(self):
 
         self.start_masternodes()
 
-        self.bump_mocktime(1)
-        self.generate(self.nodes[0], 1)
+        # it should be at least 8 blocks since v20 when MN can be used in quorums
+        self.bump_mocktime(8)
+        self.generate(self.nodes[0], 8)
         for i in range(1, num_simple_nodes):
             force_finish_mnsync(self.nodes[i])