diff --git a/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/go/query.sql.go b/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/go/query.sql.go
new file mode 100644
index 0000000000..8f6d9ffc69
--- /dev/null
+++ b/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/go/query.sql.go
@@ -0,0 +1,21 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.24.0
+// source: query.sql
+
+package datatype
+
+import (
+	"context"
+)
+
+const noop = `-- name: Noop :one
+SELECT 1
+`
+
+func (q *Queries) Noop(ctx context.Context) (int64, error) {
+	row := q.db.QueryRowContext(ctx, noop)
+	var column_1 int64
+	err := row.Scan(&column_1)
+	return column_1, err
+}
diff --git a/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/sql/query.sql b/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/sql/query.sql
index e0ac49d1ec..d32220c3d5 100644
--- a/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/sql/query.sql
+++ b/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/sql/query.sql
@@ -1 +1,2 @@
+-- name: Noop :one
 SELECT 1;
diff --git a/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/sqlc.json b/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/sqlc.json
index e62c271419..9b8d7693bc 100644
--- a/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/sqlc.json
+++ b/internal/endtoend/testdata/emit_pointers_for_null_types/sqlite/sqlc.json
@@ -5,8 +5,8 @@
       "path": "go",
       "engine": "sqlite",
       "name": "datatype",
-      "schema": "sql/",
-      "queries": "sql/",
+      "schema": "sql/types.sql",
+      "queries": "sql/query.sql",
       "emit_pointers_for_null_types": true
     }
   ]
diff --git a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/query.sql b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/query.sql
index 2cf6edbfa2..e3551898fb 100644
--- a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/query.sql
+++ b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/query.sql
@@ -1,5 +1,3 @@
-CREATE TABLE bar (id serial not null);
-
 -- name: ListBar :many
 -- Lists all bars
 SELECT id FROM (
diff --git a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/schema.sql b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/schema.sql
new file mode 100644
index 0000000000..682614c578
--- /dev/null
+++ b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/schema.sql
@@ -0,0 +1 @@
+CREATE TABLE bar (id serial not null);
diff --git a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/sqlc.json b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/sqlc.json
index fa5408afdf..9464b72b2e 100644
--- a/internal/endtoend/testdata/emit_sql_as_comment/stdlib/sqlc.json
+++ b/internal/endtoend/testdata/emit_sql_as_comment/stdlib/sqlc.json
@@ -4,7 +4,7 @@
     {
       "path": "go",
       "name": "querytest",
-      "schema": "query.sql",
+      "schema": "schema.sql",
       "queries": "query.sql",
       "emit_sql_as_comment": true
     }