diff --git a/internal/dinosql/gen.go b/internal/dinosql/gen.go
index a09439a8fc..3761db64e7 100644
--- a/internal/dinosql/gen.go
+++ b/internal/dinosql/gen.go
@@ -701,7 +701,7 @@ func (r Result) goInnerType(col core.Column, settings config.CombinedSettings) s
 		}
 		return "sql.NullBool"
 
-	case "jsonb":
+	case "json", "jsonb":
 		return "json.RawMessage"
 
 	case "bytea", "blob", "pg_catalog.bytea":
diff --git a/internal/endtoend/testdata/json/go/db.go b/internal/endtoend/testdata/json/go/db.go
new file mode 100644
index 0000000000..6a99519302
--- /dev/null
+++ b/internal/endtoend/testdata/json/go/db.go
@@ -0,0 +1,29 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+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/json/go/models.go b/internal/endtoend/testdata/json/go/models.go
new file mode 100644
index 0000000000..bac200d0ea
--- /dev/null
+++ b/internal/endtoend/testdata/json/go/models.go
@@ -0,0 +1,14 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import (
+	"encoding/json"
+)
+
+type Foo struct {
+	A json.RawMessage
+	B json.RawMessage
+	C json.RawMessage
+	D json.RawMessage
+}
diff --git a/internal/endtoend/testdata/json/go/query.sql.go b/internal/endtoend/testdata/json/go/query.sql.go
new file mode 100644
index 0000000000..3dd9e4ac38
--- /dev/null
+++ b/internal/endtoend/testdata/json/go/query.sql.go
@@ -0,0 +1,17 @@
+// Code generated by sqlc. DO NOT EDIT.
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const selectFoo = `-- name: SelectFoo :exec
+SELECT a, b, c, d FROM foo
+`
+
+func (q *Queries) SelectFoo(ctx context.Context) error {
+	_, err := q.db.ExecContext(ctx, selectFoo)
+	return err
+}
diff --git a/internal/endtoend/testdata/json/query.sql b/internal/endtoend/testdata/json/query.sql
new file mode 100644
index 0000000000..b3aa769979
--- /dev/null
+++ b/internal/endtoend/testdata/json/query.sql
@@ -0,0 +1,9 @@
+CREATE TABLE foo (
+    a json not null,
+    b jsonb not null,
+    c json,
+    d jsonb
+);
+
+-- name: SelectFoo :exec
+SELECT * FROM foo;
diff --git a/internal/endtoend/testdata/json/sqlc.json b/internal/endtoend/testdata/json/sqlc.json
new file mode 100644
index 0000000000..1161aac713
--- /dev/null
+++ b/internal/endtoend/testdata/json/sqlc.json
@@ -0,0 +1,9 @@
+{
+  "version": "1",
+  "packages": [{
+    "path": "go",
+	"name": "querytest",
+	"schema": "query.sql",
+	"queries": "query.sql"
+  }]
+}