diff --git a/config/tablet/default.yaml b/config/tablet/default.yaml
index ed9578582d0..1526ac96315 100644
--- a/config/tablet/default.yaml
+++ b/config/tablet/default.yaml
@@ -99,7 +99,6 @@ hotRowProtection:
   maxConcurrency: 5           # hot_row_protection_concurrent_transactions
 
 consolidator: enable|disable|notOnMaster # enable-consolidator, enable-consolidator-replicas
-transitionGracePeriodSeconds: 0          # serving_state_grace_period
 passthroughDML: false                    # queryserver-config-passthrough-dmls
 streamBufferSize: 32768                  # queryserver-config-stream-buffer-size
 queryCacheSize: 5000                     # queryserver-config-query-cache-size
diff --git a/go/test/endtoend/cluster/mysqlctl_process.go b/go/test/endtoend/cluster/mysqlctl_process.go
index cf680d595e3..34e290f8af3 100644
--- a/go/test/endtoend/cluster/mysqlctl_process.go
+++ b/go/test/endtoend/cluster/mysqlctl_process.go
@@ -93,7 +93,7 @@ func (mysqlctl *MysqlctlProcess) StartProcess() (*exec.Cmd, error) {
 // Stop executes mysqlctl command to stop mysql instance
 func (mysqlctl *MysqlctlProcess) Stop() (err error) {
 	log.Infof("Shutting down MySQL: %d", mysqlctl.TabletUID)
-	defer log.Infof("MySQL shurdown complete: %d", mysqlctl.TabletUID)
+	defer log.Infof("MySQL shutdown complete: %d", mysqlctl.TabletUID)
 	tmpProcess, err := mysqlctl.StopProcess()
 	if err != nil {
 		return err
diff --git a/go/test/endtoend/tabletmanager/tablet_health_test.go b/go/test/endtoend/tabletmanager/tablet_health_test.go
index c00cf8e8e57..93289bcab6f 100644
--- a/go/test/endtoend/tabletmanager/tablet_health_test.go
+++ b/go/test/endtoend/tabletmanager/tablet_health_test.go
@@ -126,7 +126,7 @@ func TestHealthCheck(t *testing.T) {
 
 	// stop replication, make sure we don't go unhealthy.
 	// TODO: replace with StopReplication once StopSlave has been removed
-	err = clusterInstance.VtctlclientProcess.ExecuteCommand("StopReplication", rTablet.Alias)
+	err = clusterInstance.VtctlclientProcess.ExecuteCommand("StopSlave", rTablet.Alias)
 	require.NoError(t, err)
 	err = clusterInstance.VtctlclientProcess.ExecuteCommand("RunHealthCheck", rTablet.Alias)
 	require.NoError(t, err)