diff --git a/core/genesis_extra_test.go b/core/genesis_extra_test.go
index d1b83b9dd4..5e1adb8a6f 100644
--- a/core/genesis_extra_test.go
+++ b/core/genesis_extra_test.go
@@ -42,24 +42,28 @@ import (
 
 func TestGenesisEthUpgrades(t *testing.T) {
 	db := rawdb.NewMemoryDatabase()
-	preEthUpgrades := &params.ChainConfig{
-		ChainID:             big.NewInt(43114), // Specifically refers to mainnet for this UT
-		HomesteadBlock:      big.NewInt(0),
-		DAOForkBlock:        nil,
-		DAOForkSupport:      false,
-		EIP150Block:         big.NewInt(0),
-		EIP155Block:         big.NewInt(0),
-		EIP158Block:         big.NewInt(0),
-		ByzantiumBlock:      big.NewInt(0),
-		ConstantinopleBlock: big.NewInt(0),
-		PetersburgBlock:     big.NewInt(0),
-		IstanbulBlock:       big.NewInt(0),
-		MuirGlacierBlock:    big.NewInt(0),
-		NetworkUpgrades: params.NetworkUpgrades{
-			ApricotPhase1BlockTimestamp: utils.NewUint64(0),
-			ApricotPhase2BlockTimestamp: utils.NewUint64(0),
+	preEthUpgrades := params.WithExtra(
+		&params.ChainConfig{
+			ChainID:             big.NewInt(43114), // Specifically refers to mainnet for this UT
+			HomesteadBlock:      big.NewInt(0),
+			DAOForkBlock:        nil,
+			DAOForkSupport:      false,
+			EIP150Block:         big.NewInt(0),
+			EIP155Block:         big.NewInt(0),
+			EIP158Block:         big.NewInt(0),
+			ByzantiumBlock:      big.NewInt(0),
+			ConstantinopleBlock: big.NewInt(0),
+			PetersburgBlock:     big.NewInt(0),
+			IstanbulBlock:       big.NewInt(0),
+			MuirGlacierBlock:    big.NewInt(0),
 		},
-	}
+		&params.ChainConfigExtra{
+			NetworkUpgrades: params.NetworkUpgrades{
+				ApricotPhase1BlockTimestamp: utils.NewUint64(0),
+				ApricotPhase2BlockTimestamp: utils.NewUint64(0),
+			},
+		},
+	)
 
 	tdb := triedb.NewDatabase(db, triedb.HashDefaults)
 	config := *preEthUpgrades