diff --git a/client/client_test.go b/client/client_test.go
index 5e949a5..cfa0803 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -159,7 +159,6 @@ func TestIntegrationWithNewDevice(t *testing.T) {
 func installHishtory(t *testing.T, userSecret string) string {
 	out := RunInteractiveBashCommands(t, `
 	gvm use go1.17
-	cd /home/david/code/hishtory
 	go build -o /tmp/client
 	/tmp/client install `+userSecret)
 	r := regexp.MustCompile(`Setting secret hishtory key to (.*)`)
diff --git a/shared/testutils.go b/shared/testutils.go
index 746211e..4ad3bf7 100644
--- a/shared/testutils.go
+++ b/shared/testutils.go
@@ -36,22 +36,35 @@ func BackupAndRestore(t *testing.T) func() {
 }
 
 func buildServer(t *testing.T) {
-	err := os.Chdir("/home/david/code/hishtory/")
-	if err != nil {
-		t.Fatalf("failed to chdir: %v", err)
+	for {
+		wd, err := os.Getwd()
+		if err != nil {
+			t.Fatalf("failed to getwd: %v", err)
+		}
+		if strings.HasSuffix(wd, "/hishtory") {
+			break
+		}
+		err = os.Chdir("../")
+		if err != nil {
+			t.Fatalf("failed to chdir: %v", err)
+		}
+		if wd == "/" {
+			t.Fatalf("failed to cd into hishtory dir!")
+		}
 	}
 	cmd := exec.Command("go", "build", "-o", "/tmp/server", "backend/server/server.go")
 	var stdout bytes.Buffer
 	cmd.Stdout = &stdout
 	var stderr bytes.Buffer
 	cmd.Stderr = &stderr
-	err = cmd.Start()
+	err := cmd.Start()
 	if err != nil {
 		t.Fatalf("failed to start to build server: %v, stderr=%#v, stdout=%#v", err, stderr.String(), stdout.String())
 	}
 	err = cmd.Wait()
 	if err != nil {
-		t.Fatalf("failed to build server: %v, stderr=%#v, stdout=%#v", err, stderr.String(), stdout.String())
+		wd, _ := os.Getwd()
+		t.Fatalf("failed to build server: %v, wd=%#v, stderr=%#v, stdout=%#v", err, wd, stderr.String(), stdout.String())
 	}
 }