diff --git a/client/client_test.go b/client/client_test.go
index 1a09678..0ca8948 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -876,7 +876,7 @@ func testHishtoryBackgroundSaving(t *testing.T, tester shellTester) {
 
 	// Test install with an unset HISHTORY_TEST var so that we save in the background (this is likely to be flakey!)
 	out := tester.RunInteractiveShell(t, `unset HISHTORY_TEST
-go build -o /tmp/client
+CGO_ENABLED=0 go build -o /tmp/client
 /tmp/client install`)
 	r := regexp.MustCompile(`Setting secret hishtory key to (.*)`)
 	matches := r.FindStringSubmatch(out)
@@ -1494,3 +1494,5 @@ ls /tmp`, randomCmdUuid, randomCmdUuid)
 		t.Fatalf("hishtory export mismatch (-expected +got):\n%s\nout=%#v", diff, out)
 	}
 }
+
+// TODO: Add a test with different users