diff --git a/Makefile b/Makefile
index c74219aef..12e674136 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ version:
 
 # We build a list of packages that omits the IDK and batch packages because
 # those packages require fancy environment setup.
-GOPACKAGES := $(shell $(GO) list ./... | grep -v "/idk" | grep -v "/batch")
+GOPACKAGES := $(shell $(GO) list ./... | grep -v "/v3/idk" | grep -v "/v3/batch")
 
 # Run test suite
 test:
diff --git a/cli/batch/sql_test.go b/cli/batch/sql_test.go
index 86aace469..04467a258 100644
--- a/cli/batch/sql_test.go
+++ b/cli/batch/sql_test.go
@@ -39,9 +39,9 @@ func TestBatchSQL(t *testing.T) {
 	s, err := buildBulkInsert(tbl, fields, ids, rows)
 	assert.NoError(t, err)
 
-	exp := `BULK INSERT INTO foo (_id,name,age) MAP (0 int,1 string,2 int) FROM x'0,Alice,11
-1,Bob,22
-2,"Carl,Comma",33
-' WITH BATCHSIZE 3 FORMAT 'CSV' INPUT 'STREAM'`
+	exp := `BULK INSERT INTO foo (_id,name,age) MAP ('$._id' id,'$.col_0' string,'$.col_1' int) FROM x'{"_id":0,"col_0":["Alice",11]}
+{"_id":1,"col_0":["Bob",22]}
+{"_id":2,"col_0":["Carl,Comma",33]}
+' WITH BATCHSIZE 3 FORMAT 'NDJSON' INPUT 'STREAM'`
 	assert.Equal(t, exp, s)
 }