diff --git a/tests/onebox.go b/tests/onebox.go
index f7202b17be1..71ff3017f59 100644
--- a/tests/onebox.go
+++ b/tests/onebox.go
@@ -432,15 +432,8 @@ func (c *temporalImpl) GetFrontendNamespaceRegistry() namespace.Registry {
 	return c.frontendNamespaceRegistry
 }
 
-func (c *temporalImpl) startFrontend(
-	hostsByService map[primitives.ServiceName]static.Hosts,
-	startWG *sync.WaitGroup,
-) {
-	serviceName := primitives.FrontendService
-	persistenceConfig, err := copyPersistenceConfig(c.persistenceConfig)
-	if err != nil {
-		c.logger.Fatal("Failed to copy persistence config for history", tag.Error(err))
-	}
+func (c *temporalImpl) copyPersistenceConfig() config.Persistence {
+	persistenceConfig := copyPersistenceConfig(c.persistenceConfig)
 	if c.esConfig != nil {
 		esDataStoreName := "es-visibility"
 		persistenceConfig.VisibilityStore = esDataStoreName
@@ -448,6 +441,14 @@ func (c *temporalImpl) startFrontend(
 			Elasticsearch: c.esConfig,
 		}
 	}
+	return persistenceConfig
+}
+
+func (c *temporalImpl) startFrontend(
+	hostsByService map[primitives.ServiceName]static.Hosts,
+	startWG *sync.WaitGroup,
+) {
+	serviceName := primitives.FrontendService
 
 	var frontendService *frontend.Service
 	var clientBean client.Bean
@@ -455,7 +456,7 @@ func (c *temporalImpl) startFrontend(
 	var rpcFactory common.RPCFactory
 	feApp := fx.New(
 		fx.Supply(
-			persistenceConfig,
+			c.copyPersistenceConfig(),
 			serviceName,
 			c.mockAdminClient,
 		),
@@ -501,7 +502,7 @@ func (c *temporalImpl) startFrontend(
 		temporal.FxLogAdapter,
 		c.getFxOptionsForService(primitives.FrontendService),
 	)
-	err = feApp.Err()
+	err := feApp.Err()
 	if err != nil {
 		c.logger.Fatal("unable to construct frontend service", tag.Error(err))
 	}
@@ -535,24 +536,12 @@ func (c *temporalImpl) startHistory(
 		historyHosts.Self = host
 		hostMap[serviceName] = historyHosts
 
-		persistenceConfig, err := copyPersistenceConfig(c.persistenceConfig)
-		if err != nil {
-			c.logger.Fatal("Failed to copy persistence config for history", tag.Error(err))
-		}
-		if c.esConfig != nil {
-			esDataStoreName := "es-visibility"
-			persistenceConfig.VisibilityStore = esDataStoreName
-			persistenceConfig.DataStores[esDataStoreName] = config.DataStore{
-				Elasticsearch: c.esConfig,
-			}
-		}
-
 		var historyService *history.Service
 		var clientBean client.Bean
 		var namespaceRegistry namespace.Registry
 		app := fx.New(
 			fx.Supply(
-				persistenceConfig,
+				c.copyPersistenceConfig(),
 				serviceName,
 				c.mockAdminClient,
 			),
@@ -596,7 +585,7 @@ func (c *temporalImpl) startHistory(
 			temporal.FxLogAdapter,
 			c.getFxOptionsForService(primitives.HistoryService),
 		)
-		err = app.Err()
+		err := app.Err()
 		if err != nil {
 			c.logger.Fatal("unable to construct history service", tag.Error(err))
 		}
@@ -631,24 +620,12 @@ func (c *temporalImpl) startMatching(
 ) {
 	serviceName := primitives.MatchingService
 
-	persistenceConfig, err := copyPersistenceConfig(c.persistenceConfig)
-	if err != nil {
-		c.logger.Fatal("Failed to copy persistence config for matching", tag.Error(err))
-	}
-	if c.esConfig != nil {
-		esDataStoreName := "es-visibility"
-		persistenceConfig.VisibilityStore = esDataStoreName
-		persistenceConfig.DataStores[esDataStoreName] = config.DataStore{
-			Elasticsearch: c.esConfig,
-		}
-	}
-
 	var matchingService *matching.Service
 	var clientBean client.Bean
 	var namespaceRegistry namespace.Registry
 	app := fx.New(
 		fx.Supply(
-			persistenceConfig,
+			c.copyPersistenceConfig(),
 			serviceName,
 			c.mockAdminClient,
 		),
@@ -684,7 +661,7 @@ func (c *temporalImpl) startMatching(
 		temporal.FxLogAdapter,
 		c.getFxOptionsForService(primitives.MatchingService),
 	)
-	err = app.Err()
+	err := app.Err()
 	if err != nil {
 		c.logger.Fatal("unable to start matching service", tag.Error(err))
 	}
@@ -712,18 +689,6 @@ func (c *temporalImpl) startWorker(
 ) {
 	serviceName := primitives.WorkerService
 
-	persistenceConfig, err := copyPersistenceConfig(c.persistenceConfig)
-	if err != nil {
-		c.logger.Fatal("Failed to copy persistence config for history", tag.Error(err))
-	}
-	if c.esConfig != nil {
-		esDataStoreName := "es-visibility"
-		persistenceConfig.VisibilityStore = esDataStoreName
-		persistenceConfig.DataStores[esDataStoreName] = config.DataStore{
-			Elasticsearch: c.esConfig,
-		}
-	}
-
 	clusterConfigCopy := cluster.Config{
 		EnableGlobalNamespace:    c.clusterMetadataConfig.EnableGlobalNamespace,
 		FailoverVersionIncrement: c.clusterMetadataConfig.FailoverVersionIncrement,
@@ -740,7 +705,7 @@ func (c *temporalImpl) startWorker(
 	var namespaceRegistry namespace.Registry
 	app := fx.New(
 		fx.Supply(
-			persistenceConfig,
+			c.copyPersistenceConfig(),
 			serviceName,
 			c.mockAdminClient,
 		),
@@ -778,7 +743,7 @@ func (c *temporalImpl) startWorker(
 		temporal.FxLogAdapter,
 		c.getFxOptionsForService(primitives.WorkerService),
 	)
-	err = app.Err()
+	err := app.Err()
 	if err != nil {
 		c.logger.Fatal("unable to start worker service", tag.Error(err))
 	}
@@ -1018,26 +983,19 @@ func (c *temporalImpl) Authorize(
 	return authorization.Result{Decision: authorization.DecisionAllow}, nil
 }
 
-// copyPersistenceConfig makes a deepcopy of persistence config.
+// copyPersistenceConfig makes a deep copy of persistence config.
 // This is just a temp fix for the race condition of persistence config.
 // The race condition happens because all the services are using the same datastore map in the config.
 // Also all services will retry to modify the maxQPS field in the datastore during start up and use the modified maxQPS value to create a persistence factory.
-func copyPersistenceConfig(pConfig config.Persistence) (config.Persistence, error) {
-	copiedDataStores := make(map[string]config.DataStore)
-	for name, value := range pConfig.DataStores {
-		copiedDataStore := config.DataStore{}
-		encodedDataStore, err := json.Marshal(value)
-		if err != nil {
-			return pConfig, err
-		}
-
-		if err = json.Unmarshal(encodedDataStore, &copiedDataStore); err != nil {
-			return pConfig, err
-		}
-		copiedDataStores[name] = copiedDataStore
+func copyPersistenceConfig(cfg config.Persistence) config.Persistence {
+	var newCfg config.Persistence
+	b, err := json.Marshal(cfg)
+	if err != nil {
+		panic("copy persistence config: " + err.Error())
+	} else if err = json.Unmarshal(b, &newCfg); err != nil {
+		panic("copy persistence config: " + err.Error())
 	}
-	pConfig.DataStores = copiedDataStores
-	return pConfig, nil
+	return newCfg
 }
 
 func sdkClientFactoryProvider(