diff --git a/plugins/database/mysql/mysql.go b/plugins/database/mysql/mysql.go
index e7e2a8aea..6485aaa86 100644
--- a/plugins/database/mysql/mysql.go
+++ b/plugins/database/mysql/mysql.go
@@ -23,6 +23,7 @@ type MySQL struct {
 	credsutil.CredentialsProducer
 }
 
+// New implements builtinplugins.BuiltinFactory
 func New() (interface{}, error) {
 	connProducer := &connutil.SQLConnectionProducer{}
 	connProducer.Type = mySQLTypeName
diff --git a/vault/logical_system_test.go b/vault/logical_system_test.go
index 0785e07a1..9da4cbdec 100644
--- a/vault/logical_system_test.go
+++ b/vault/logical_system_test.go
@@ -1122,8 +1122,6 @@ func TestSystemBackend_PluginCatalog_CRUD(t *testing.T) {
 		t.Fatalf("error: %v", err)
 	}
 	c.pluginCatalog.directory = sym
-	c.pluginCatalog.vaultCommand = "vault"
-	c.pluginCatalog.vaultSHA256 = []byte{'1'}
 
 	req := logical.TestRequest(t, logical.ListOperation, "plugin-catalog/")
 	resp, err := b.HandleRequest(req)
diff --git a/vault/plugin_catalog_test.go b/vault/plugin_catalog_test.go
index e78e7d963..c33a890cd 100644
--- a/vault/plugin_catalog_test.go
+++ b/vault/plugin_catalog_test.go
@@ -21,8 +21,6 @@ func TestPluginCatalog_CRUD(t *testing.T) {
 		t.Fatalf("error: %v", err)
 	}
 	core.pluginCatalog.directory = sym
-	core.pluginCatalog.vaultCommand = "vault"
-	core.pluginCatalog.vaultSHA256 = []byte{'1'}
 
 	// Get builtin plugin
 	p, err := core.pluginCatalog.Get("mysql-database-plugin")
@@ -99,8 +97,6 @@ func TestPluginCatalog_List(t *testing.T) {
 		t.Fatalf("error: %v", err)
 	}
 	core.pluginCatalog.directory = sym
-	core.pluginCatalog.vaultCommand = "vault"
-	core.pluginCatalog.vaultSHA256 = []byte{'1'}
 
 	// Get builtin plugins and sort them
 	builtinKeys := builtinplugins.BuiltinPlugins.Keys()