diff --git a/cmd/zetae2e/local/local.go b/cmd/zetae2e/local/local.go
index 1f3b1ba85c..982434164f 100644
--- a/cmd/zetae2e/local/local.go
+++ b/cmd/zetae2e/local/local.go
@@ -108,7 +108,7 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 		light             = must(cmd.Flags().GetBool(flagLight))
 		setupOnly         = must(cmd.Flags().GetBool(flagSetupOnly))
 		skipSetup         = must(cmd.Flags().GetBool(flagSkipSetup))
-		//skipBitcoinSetup  = must(cmd.Flags().GetBool(flagSkipBitcoinSetup))
+		skipBitcoinSetup  = must(cmd.Flags().GetBool(flagSkipBitcoinSetup))
 		skipHeaderProof  = must(cmd.Flags().GetBool(flagSkipHeaderProof))
 		skipTrackerCheck = must(cmd.Flags().GetBool(flagSkipTrackerCheck))
 		testTSSMigration = must(cmd.Flags().GetBool(flagTestTSSMigration))
@@ -255,11 +255,6 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 		deployerRunner.UpdateChainParamsV2Contracts()
 		deployerRunner.ERC20CustodyAddr = deployerRunner.ERC20CustodyV2Addr
 
-		if testSolana {
-			deployerRunner.SetupSolana(conf.AdditionalAccounts.UserSolana.SolanaPrivateKey.String())
-		}
-		noError(deployerRunner.FundEmissionsPool())
-
 		deployerRunner.MintERC20OnEvm(1e10)
 
 		logger.Print("✅ setup completed in %s", time.Since(startTime))
@@ -392,11 +387,6 @@ func localE2ETest(cmd *cobra.Command, _ []string) {
 		eg.Go(erc20TestRoutine(conf, deployerRunner, verbose, erc20Tests...))
 		eg.Go(zetaTestRoutine(conf, deployerRunner, verbose, zetaTests...))
 		eg.Go(zevmMPTestRoutine(conf, deployerRunner, verbose, zevmMPTests...))
-		eg.Go(bitcoinTestRoutine(conf, deployerRunner, verbose, !skipBitcoinSetup, bitcoinTests...))
-		eg.Go(ethereumTestRoutine(conf, deployerRunner, verbose, ethereumTests...))
-		eg.Go(erc20TestRoutine(conf, deployerRunner, verbose, erc20Tests...))
-		eg.Go(zetaTestRoutine(conf, deployerRunner, verbose, zetaTests...))
-		eg.Go(zevmMPTestRoutine(conf, deployerRunner, verbose, zevmMPTests...))
 		runnerDeposit, runnerWithdraw := initBitcoinTestRunners(
 			conf,
 			deployerRunner,