diff --git a/internal/codegen/golang/postgresql_type.go b/internal/codegen/golang/postgresql_type.go
index 2046014682..ae3dc6c95f 100644
--- a/internal/codegen/golang/postgresql_type.go
+++ b/internal/codegen/golang/postgresql_type.go
@@ -155,7 +155,7 @@ func postgresType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 		}
 		return "sql.NullTime"
 
-	case "text", "pg_catalog.varchar", "pg_catalog.bpchar", "string":
+	case "text", "pg_catalog.varchar", "pg_catalog.bpchar", "string", "citext":
 		if notNull {
 			return "string"
 		}
diff --git a/internal/endtoend/testdata/citext/pgx/go/db.go b/internal/endtoend/testdata/citext/pgx/go/db.go
new file mode 100644
index 0000000000..9d5f1c84a5
--- /dev/null
+++ b/internal/endtoend/testdata/citext/pgx/go/db.go
@@ -0,0 +1,32 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+
+package querytest
+
+import (
+	"context"
+
+	"github.com/jackc/pgconn"
+	"github.com/jackc/pgx/v4"
+)
+
+type DBTX interface {
+	Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error)
+	Query(context.Context, string, ...interface{}) (pgx.Rows, error)
+	QueryRow(context.Context, string, ...interface{}) pgx.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx pgx.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/citext/pgx/go/models.go b/internal/endtoend/testdata/citext/pgx/go/models.go
new file mode 100644
index 0000000000..a6e0723747
--- /dev/null
+++ b/internal/endtoend/testdata/citext/pgx/go/models.go
@@ -0,0 +1,14 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+
+package querytest
+
+import (
+	"database/sql"
+)
+
+type Foo struct {
+	Bar sql.NullString
+	Bat string
+}
diff --git a/internal/endtoend/testdata/citext/pgx/go/query.sql.go b/internal/endtoend/testdata/citext/pgx/go/query.sql.go
new file mode 100644
index 0000000000..d02fc797b3
--- /dev/null
+++ b/internal/endtoend/testdata/citext/pgx/go/query.sql.go
@@ -0,0 +1,35 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const getCitexts = `-- name: GetCitexts :many
+SELECT bar, bat
+FROM foo
+`
+
+func (q *Queries) GetCitexts(ctx context.Context) ([]Foo, error) {
+	rows, err := q.db.Query(ctx, getCitexts)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Foo
+	for rows.Next() {
+		var i Foo
+		if err := rows.Scan(&i.Bar, &i.Bat); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/citext/pgx/query.sql b/internal/endtoend/testdata/citext/pgx/query.sql
new file mode 100644
index 0000000000..2e358ab8d0
--- /dev/null
+++ b/internal/endtoend/testdata/citext/pgx/query.sql
@@ -0,0 +1,9 @@
+CREATE TABLE foo (
+    bar citext,
+    bat citext not null
+);
+
+-- name: GetCitexts :many
+SELECT bar, bat
+FROM foo;
+
diff --git a/internal/endtoend/testdata/citext/pgx/sqlc.json b/internal/endtoend/testdata/citext/pgx/sqlc.json
new file mode 100644
index 0000000000..9403bd0279
--- /dev/null
+++ b/internal/endtoend/testdata/citext/pgx/sqlc.json
@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v4",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}
diff --git a/internal/endtoend/testdata/citext/stdlib/go/db.go b/internal/endtoend/testdata/citext/stdlib/go/db.go
new file mode 100644
index 0000000000..5f69347d4b
--- /dev/null
+++ b/internal/endtoend/testdata/citext/stdlib/go/db.go
@@ -0,0 +1,31 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/citext/stdlib/go/models.go b/internal/endtoend/testdata/citext/stdlib/go/models.go
new file mode 100644
index 0000000000..a6e0723747
--- /dev/null
+++ b/internal/endtoend/testdata/citext/stdlib/go/models.go
@@ -0,0 +1,14 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+
+package querytest
+
+import (
+	"database/sql"
+)
+
+type Foo struct {
+	Bar sql.NullString
+	Bat string
+}
diff --git a/internal/endtoend/testdata/citext/stdlib/go/query.sql.go b/internal/endtoend/testdata/citext/stdlib/go/query.sql.go
new file mode 100644
index 0000000000..fecde388b7
--- /dev/null
+++ b/internal/endtoend/testdata/citext/stdlib/go/query.sql.go
@@ -0,0 +1,38 @@
+// Code generated by sqlc. DO NOT EDIT.
+// versions:
+//   sqlc v1.15.0
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const getCitexts = `-- name: GetCitexts :many
+SELECT bar, bat
+FROM foo
+`
+
+func (q *Queries) GetCitexts(ctx context.Context) ([]Foo, error) {
+	rows, err := q.db.QueryContext(ctx, getCitexts)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Foo
+	for rows.Next() {
+		var i Foo
+		if err := rows.Scan(&i.Bar, &i.Bat); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/citext/stdlib/query.sql b/internal/endtoend/testdata/citext/stdlib/query.sql
new file mode 100644
index 0000000000..14543023c7
--- /dev/null
+++ b/internal/endtoend/testdata/citext/stdlib/query.sql
@@ -0,0 +1,10 @@
+CREATE TABLE foo (
+    bar citext,
+    bat citext not null
+);
+
+-- name: GetCitexts :many
+SELECT bar, bat
+FROM foo;
+
+
diff --git a/internal/endtoend/testdata/citext/stdlib/sqlc.json b/internal/endtoend/testdata/citext/stdlib/sqlc.json
new file mode 100644
index 0000000000..c72b6132d5
--- /dev/null
+++ b/internal/endtoend/testdata/citext/stdlib/sqlc.json
@@ -0,0 +1,12 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}