diff --git a/.vscode/launch.json b/.vscode/launch.json
index 28499f1fb2e..85338ddd439 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -16,6 +16,15 @@
         "cfg:app_mode=development",
       ]
     },
+    {
+      "name": "Attach to Test Process",
+      "type": "go",
+      "request": "attach",
+      "mode": "remote",
+      "host": "127.0.0.1",
+      "port": 50480,
+      "apiVersion": 2,
+    },
     {
       "name": "Run API Server (testdata)",
       "type": "go",
diff --git a/pkg/tests/testinfra/testinfra.go b/pkg/tests/testinfra/testinfra.go
index cca31c322e6..63272dc4f5d 100644
--- a/pkg/tests/testinfra/testinfra.go
+++ b/pkg/tests/testinfra/testinfra.go
@@ -163,6 +163,13 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 		dir, err := filepath.Abs(rootDir)
 		require.NoError(t, err)
 
+		// When running within an enterprise test, we need to move to the grafana directory
+		if strings.HasSuffix(dir, "grafana-enterprise") {
+			rootDir = filepath.Join(rootDir, "..", "grafana")
+			dir, err = filepath.Abs(rootDir)
+			require.NoError(t, err)
+		}
+
 		exists, err := fs.Exists(filepath.Join(dir, "public", "views"))
 		require.NoError(t, err)