diff --git a/client/client_test.go b/client/client_test.go
index be3c3c9..5cd0089 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -258,13 +258,13 @@ func TestAdvancedQuery(t *testing.T) {
 	userSecret := installHishtory(t, "")
 
 	// An empty hishtory query
-	out := RunInteractiveBashCommands(t, `hishtory query`)
-	if strings.Count(out, "\n") != 3 {
-		t.Fatalf("hishtory query has unexpected out %#v", out)
-	}
-	if strings.Count(out, "/tmp/client install") != 1 {
-		t.Fatalf("hishtory query has unexpected out %#v", out)
-	}
+	// out := RunInteractiveBashCommands(t, `hishtory query`)
+	// if strings.Count(out, "\n") != 3 {
+	// 	t.Fatalf("hishtory query has unexpected out %#v", out)
+	// }
+	// if strings.Count(out, "/tmp/client install") != 1 {
+	// 	t.Fatalf("hishtory query has unexpected out %#v", out)
+	// }
 
 	// Run some commands we can query for
 	_, err := RunInteractiveBashCommandsWithoutStrictMode(t, `
@@ -280,7 +280,7 @@ func TestAdvancedQuery(t *testing.T) {
 	}
 
 	// Query based on cwd
-	out = RunInteractiveBashCommands(t, `hishtory query cwd:/tmp`)
+	out := RunInteractiveBashCommands(t, `hishtory query cwd:/tmp`)
 	if !strings.Contains(out, "echo querybydir") {
 		t.Fatalf("hishtory query doesn't contain result matching cwd:/tmp, out=%#v", out)
 	}
@@ -396,7 +396,7 @@ func TestAdvancedQuery(t *testing.T) {
 	if strings.Contains(out, "echo") {
 		t.Fatalf("hishtory query contains unexpected result, out=%#v", out)
 	}
-	if strings.Count(out, "\n") != 9 {
+	if strings.Count(out, "\n") != 7 {
 		t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out)
 	}
 
@@ -421,7 +421,7 @@ func TestAdvancedQuery(t *testing.T) {
 	if strings.Contains(out, "echo") {
 		t.Fatalf("hishtory query contains unexpected result, out=%#v", out)
 	}
-	if strings.Count(out, "\n") != 9 {
+	if strings.Count(out, "\n") != 7 {
 		t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out)
 	}
 }