diff --git a/command/version_history.go b/command/version_history.go
index 5c794bc0e0..1a4c730464 100644
--- a/command/version_history.go
+++ b/command/version_history.go
@@ -2,10 +2,11 @@ package command
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/mitchellh/cli"
 	"github.com/posener/complete"
 	"github.com/ryanuber/columnize"
-	"strings"
 )
 
 var (
diff --git a/vault/logical_system.go b/vault/logical_system.go
index 0079537608..6d853dee44 100644
--- a/vault/logical_system.go
+++ b/vault/logical_system.go
@@ -4278,7 +4278,6 @@ func (b *SystemBackend) handleVersionHistoryList(ctx context.Context, req *logic
 	}
 
 	return logical.ListResponseWithInfo(respKeys, respKeyInfo), nil
-
 }
 
 func sanitizePath(path string) string {
diff --git a/vault/logical_system_integ_test.go b/vault/logical_system_integ_test.go
index db24fd076b..5a26849f2d 100644
--- a/vault/logical_system_integ_test.go
+++ b/vault/logical_system_integ_test.go
@@ -961,4 +961,4 @@ func TestSystemBackend_VersionHistory_authenticated(t *testing.T) {
 	if keyInfo[version.Version] == nil {
 		t.Fatalf("expected version %s to be present in key_info, actual: %#v", version.Version, keyInfo)
 	}
-}
\ No newline at end of file
+}
diff --git a/vault/version_store.go b/vault/version_store.go
index 5b665944f2..7e1d446904 100644
--- a/vault/version_store.go
+++ b/vault/version_store.go
@@ -114,7 +114,6 @@ func (c *Core) loadVersionTimestamps(ctx context.Context) error {
 		if timestampInstalled.Location() != time.UTC {
 			timestampInstalled = timestampInstalled.UTC()
 			isUpdated, err := c.storeVersionTimestamp(ctx, vaultVersion.Version, timestampInstalled, true)
-
 			if err != nil {
 				c.logger.Warn("failed to rewrite vault version timestamp as UTC", "error", err)
 			}
diff --git a/vault/version_store_test.go b/vault/version_store_test.go
index 0c3b2ec000..92c010d446 100644
--- a/vault/version_store_test.go
+++ b/vault/version_store_test.go
@@ -33,12 +33,15 @@ func TestVersionStore_GetOldestVersion(t *testing.T) {
 	upgradeTimePlusEpsilon := time.Now().UTC()
 
 	// 1.6.2 is stored before 1.6.1, so even though it is a higher number, it should be returned.
-	versionEntries := []struct{version string; ts time.Time}{
-		{"1.6.2", upgradeTimePlusEpsilon.Add(-4*time.Hour)},
-		{"1.6.1", upgradeTimePlusEpsilon.Add(2*time.Hour)},
+	versionEntries := []struct {
+		version string
+		ts      time.Time
+	}{
+		{"1.6.2", upgradeTimePlusEpsilon.Add(-4 * time.Hour)},
+		{"1.6.1", upgradeTimePlusEpsilon.Add(2 * time.Hour)},
 	}
 
-	for _, entry := range versionEntries{
+	for _, entry := range versionEntries {
 		_, err := c.storeVersionTimestamp(context.Background(), entry.version, entry.ts, false)
 		if err != nil {
 			t.Fatalf("failed to write version entry %#v, err: %s", entry, err.Error())
@@ -74,12 +77,15 @@ func TestVersionStore_SelfHealUTC(t *testing.T) {
 
 	nowEST := time.Now().In(estLoc)
 
-	versionEntries := []struct{version string; ts time.Time}{
-		{"1.9.0", nowEST.Add(24*time.Hour)},
-		{"1.9.1", nowEST.Add(48*time.Hour)},
+	versionEntries := []struct {
+		version string
+		ts      time.Time
+	}{
+		{"1.9.0", nowEST.Add(24 * time.Hour)},
+		{"1.9.1", nowEST.Add(48 * time.Hour)},
 	}
 
-	for _, entry := range versionEntries{
+	for _, entry := range versionEntries {
 		_, err := c.storeVersionTimestamp(context.Background(), entry.version, entry.ts, false)
 		if err != nil {
 			t.Fatalf("failed to write version entry %#v, err: %s", entry, err.Error())