diff --git a/nvim/api_test.go b/nvim/api_test.go
index f366e506..1221fd6c 100644
--- a/nvim/api_test.go
+++ b/nvim/api_test.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"os/exec"
 	"path"
 	"path/filepath"
 	"reflect"
@@ -4459,20 +4458,10 @@ func testRuntime(v *Nvim) func(*testing.T) {
 		vimDiff := filepath.Join(runtimePath, "doc", "vim_diff.txt")
 		want := fmt.Sprintf("%s,%s", viDiff, vimDiff)
 
-		binName := BinaryName
-		if nvimCmd := *flagNvimPath; nvimCmd != "" {
-			binName = nvimCmd
-		}
-		binaryPath, err := exec.LookPath(binName)
-		if err != nil {
+		var wantPaths []string
+		if err := v.Eval("nvim_list_runtime_paths()", &wantPaths); err != nil {
 			t.Fatal(err)
 		}
-		nvimPrefix := filepath.Dir(filepath.Dir(binaryPath))
-
-		wantPaths := []string{
-			filepath.Join(nvimPrefix, "lib", "nvim"),
-			filepath.Join(nvimPrefix, "share", "nvim", "runtime"),
-		}
 		sort.Strings(wantPaths)
 
 		argName := filepath.Join("doc", "*_diff.txt")
@@ -4504,7 +4493,7 @@ func testRuntime(v *Nvim) func(*testing.T) {
 				got := strings.Join(paths, ",")
 				want := strings.Join(wantPaths, ",")
 				t.Logf("%s\n got: %v\nwant: %s", t.Name(), got, want)
-				if !reflect.DeepEqual(got, want) {
+				if got != want {
 					t.Fatalf("RuntimePaths():\n got %v\nwant %v", got, want)
 				}
 			})
@@ -4541,7 +4530,7 @@ func testRuntime(v *Nvim) func(*testing.T) {
 
 				got := strings.Join(paths, ",")
 				want := strings.Join(wantPaths, ",")
-				if !reflect.DeepEqual(got, want) {
+				if got != want {
 					t.Fatalf("RuntimePaths():\n got %v\nwant %v", paths, wantPaths)
 				}
 			})
@@ -5824,7 +5813,7 @@ func testAutocmd(v *Nvim) func(*testing.T) {
 					t.Fatal(err)
 				}
 
-				if err := v.ExecAutocmds(`User Test`, map[string]interface{}{"group": augID}); err != nil {
+				if err := v.ExecAutocmds(`User`, map[string]interface{}{"group": augID}); err != nil {
 					t.Fatal(err)
 				}
 
@@ -5933,7 +5922,7 @@ func testAutocmd(v *Nvim) func(*testing.T) {
 					t.Fatal(err)
 				}
 
-				b.ExecAutocmds(`User Test`, map[string]interface{}{"group": augID})
+				b.ExecAutocmds(`User`, map[string]interface{}{"group": augID})
 				if err := b.Execute(); err != nil {
 					t.Fatal(err)
 				}
diff --git a/nvim/nvim_test.go b/nvim/nvim_test.go
index 4ce60d54..432d400e 100644
--- a/nvim/nvim_test.go
+++ b/nvim/nvim_test.go
@@ -31,6 +31,7 @@ func newChildProcess(tb testing.TB, opts ...ChildProcessOption) (v *Nvim) {
 			"-n",
 			"-i", "NONE",
 			"--headless",
+			"--embed",
 		),
 		ChildProcessContext(ctx),
 		ChildProcessLogf(tb.Logf),