diff --git a/test/RadworksGovernor.t.sol b/test/RadworksGovernor.t.sol
index 54d6b02..d4b2987 100644
--- a/test/RadworksGovernor.t.sol
+++ b/test/RadworksGovernor.t.sol
@@ -119,6 +119,7 @@ abstract contract Propose is ProposalTest {
     // RAD_TOKEN handled specially as bravo upgrade changes RAD token balances
     IERC20 _token = IERC20(RAD_TOKEN);
     _assumeReceiver(_receiver);
+    vm.assume(_receiver != SCOPELIFT_ADDRESS);
     uint256 _timelockTokenBalance = _token.balanceOf(TIMELOCK);
 
     // bound by the number of tokens the timelock currently controls
@@ -232,6 +233,7 @@ abstract contract Propose is ProposalTest {
     // @dev: RAD_TOKEN handled specially as bravo upgrade changes RAD token balances
     IERC20 _token = IERC20(RAD_TOKEN);
     _assumeReceiver(_receiver);
+    vm.assume(_receiver != SCOPELIFT_ADDRESS);
 
     vm.deal(TIMELOCK, _amountETH);
     uint256 _timelockETHBalance = TIMELOCK.balance;
@@ -453,6 +455,7 @@ abstract contract Propose is ProposalTest {
     // @dev: RAD_TOKEN handled specially as bravo upgrade changes RAD token balances
     IERC20 _token = IERC20(RAD_TOKEN);
     _assumeReceiver(_receiver);
+    vm.assume(_receiver != SCOPELIFT_ADDRESS);
     uint256 _timelockTokenBalance = _token.balanceOf(TIMELOCK);
 
     // bound by the number of tokens the timelock currently controls
diff --git a/test/helpers/ProposalTest.sol b/test/helpers/ProposalTest.sol
index 5fc2eb7..ae384d8 100644
--- a/test/helpers/ProposalTest.sol
+++ b/test/helpers/ProposalTest.sol
@@ -36,8 +36,17 @@ abstract contract ProposalTest is RadworksGovernorTest {
   function setUp() public virtual override {
     RadworksGovernorTest.setUp();
     initialProposalCount = governorAlpha.proposalCount();
-    TestableProposeScript _proposeScript = new TestableProposeScript();
-    upgradeProposalId = _proposeScript.run(governorBravo);
+    if (_useDeployedGovernorBravo()) {
+      // Use the actual live proposal data
+      upgradeProposalId = 25;
+      // Since the proposal was already submitted, the count before its submission is one less
+      initialProposalCount = governorAlpha.proposalCount() - 1;
+    } else {
+      initialProposalCount = governorAlpha.proposalCount();
+
+      TestableProposeScript _proposeScript = new TestableProposeScript();
+      upgradeProposalId = _proposeScript.run(governorBravo);
+    }
   }
 
   //--------------- HELPERS ---------------//
diff --git a/test/helpers/RadworksGovernorTest.sol b/test/helpers/RadworksGovernorTest.sol
index d52513c..111ce4f 100644
--- a/test/helpers/RadworksGovernorTest.sol
+++ b/test/helpers/RadworksGovernorTest.sol
@@ -28,7 +28,7 @@ abstract contract RadworksGovernorTest is Test, DeployInput, Constants {
   function setUp() public virtual {
     // The latest block when this test was written. If you update the fork block
     // make sure to also update the top 6 delegates below.
-    uint256 _forkBlock = 20_341_999;
+    uint256 _forkBlock = 20_826_606;
 
     vm.createSelectFork(vm.rpcUrl("mainnet"), _forkBlock);