diff --git a/go/oasis-test-runner/scenario/e2e/e2e.go b/go/oasis-test-runner/scenario/e2e/e2e.go
index 8ce86f2f6e9..18592954a9c 100644
--- a/go/oasis-test-runner/scenario/e2e/e2e.go
+++ b/go/oasis-test-runner/scenario/e2e/e2e.go
@@ -417,7 +417,7 @@ func RegisterScenarios() error {
 		// Genesis file test.
 		GenesisFile,
 		// Node upgrade tests.
-		NodeUpgrade,
+		NodeUpgradeDummy,
 		NodeUpgradeCancel,
 		// Debonding entries from genesis test.
 		Debond,
diff --git a/go/oasis-test-runner/scenario/e2e/upgrade.go b/go/oasis-test-runner/scenario/e2e/upgrade.go
index b6bfd2c8aa6..c1a8de9493a 100644
--- a/go/oasis-test-runner/scenario/e2e/upgrade.go
+++ b/go/oasis-test-runner/scenario/e2e/upgrade.go
@@ -28,8 +28,8 @@ import (
 )
 
 var (
-	// NodeUpgrade is the node upgrade scenario.
-	NodeUpgrade scenario.Scenario = newNodeUpgradeImpl()
+	// NodeUpgradeDummy is the node upgrade dummy scenario.
+	NodeUpgradeDummy scenario.Scenario = newNodeUpgradeImpl(migrations.DummyUpgradeHandler)
 
 	malformedDescriptor = []byte(`{
 		"v": 1,
@@ -56,6 +56,8 @@ type nodeUpgradeImpl struct {
 
 	ctx          context.Context
 	currentEpoch beacon.EpochTime
+
+	handlerName string
 }
 
 func (sc *nodeUpgradeImpl) writeDescriptor(name string, content []byte) (string, error) {
@@ -107,18 +109,20 @@ func (sc *nodeUpgradeImpl) restart(wait bool) error {
 	}
 }
 
-func newNodeUpgradeImpl() scenario.Scenario {
+func newNodeUpgradeImpl(handlerName string) scenario.Scenario {
 	sc := &nodeUpgradeImpl{
-		E2E: *NewE2E("node-upgrade"),
-		ctx: context.Background(),
+		E2E:         *NewE2E("node-upgrade-" + handlerName),
+		ctx:         context.Background(),
+		handlerName: handlerName,
 	}
 	return sc
 }
 
 func (sc *nodeUpgradeImpl) Clone() scenario.Scenario {
 	return &nodeUpgradeImpl{
-		E2E: sc.E2E.Clone(),
-		ctx: context.Background(),
+		E2E:         sc.E2E.Clone(),
+		ctx:         context.Background(),
+		handlerName: sc.handlerName,
 	}
 }
 
@@ -276,7 +280,7 @@ func (sc *nodeUpgradeImpl) Run(childEnv *env.Env) error { // nolint: gocyclo
 	store.Close()
 
 	validDescriptor := baseDescriptor
-	validDescriptor.Handler = migrations.DummyUpgradeHandler
+	validDescriptor.Handler = sc.handlerName
 	validDescriptor.Epoch = sc.currentEpoch + 1
 	desc, err = json.Marshal(validDescriptor)
 	if err != nil {