diff --git a/command/secrets_enable_test.go b/command/secrets_enable_test.go
index 952bd98cc1..3b300bb324 100644
--- a/command/secrets_enable_test.go
+++ b/command/secrets_enable_test.go
@@ -196,8 +196,8 @@ func TestSecretsEnableCommand_Run(t *testing.T) {
 			t.Fatal(err)
 		}
 		for _, p := range plugins {
-			if p.IsDir() && strings.HasPrefix(p.Name(), "vault-plugin-") && !strings.HasPrefix(p.Name(), "vault-plugin-auth-") {
-				backends = append(backends, strings.TrimPrefix(p.Name(), "vault-plugin-"))
+			if p.IsDir() && strings.HasPrefix(p.Name(), "vault-plugin-secrets-") {
+				backends = append(backends, strings.TrimPrefix(p.Name(), "vault-plugin-secrets-"))
 			}
 		}
 
diff --git a/http/sys_mount_test.go b/http/sys_mount_test.go
index ca952a7bdd..859b7a4140 100644
--- a/http/sys_mount_test.go
+++ b/http/sys_mount_test.go
@@ -1419,11 +1419,13 @@ func TestSysTuneMount_passthroughRequestHeaders(t *testing.T) {
 		"data": map[string]interface{}{
 			"default_lease_ttl":           json.Number("2764800"),
 			"max_lease_ttl":               json.Number("2764800"),
+			"options":                     map[string]interface{}{"versioned": "true"},
 			"force_no_cache":              false,
 			"passthrough_request_headers": []interface{}{"X-Vault-Foo"},
 		},
 		"default_lease_ttl":           json.Number("2764800"),
 		"max_lease_ttl":               json.Number("2764800"),
+		"options":                     map[string]interface{}{"versioned": "true"},
 		"force_no_cache":              false,
 		"passthrough_request_headers": []interface{}{"X-Vault-Foo"},
 	}
@@ -1455,10 +1457,12 @@ func TestSysTuneMount_passthroughRequestHeaders(t *testing.T) {
 			"default_lease_ttl": json.Number("2764800"),
 			"max_lease_ttl":     json.Number("2764800"),
 			"force_no_cache":    false,
+			"options":           map[string]interface{}{"versioned": "true"},
 		},
 		"default_lease_ttl": json.Number("2764800"),
 		"max_lease_ttl":     json.Number("2764800"),
 		"force_no_cache":    false,
+		"options":           map[string]interface{}{"versioned": "true"},
 	}
 	testResponseBody(t, resp, &actual)
 	expected["request_id"] = actual["request_id"]