diff --git a/pkg/cmdutil/json_flags.go b/pkg/cmdutil/json_flags.go
index 43c3f1714..7b783c3ee 100644
--- a/pkg/cmdutil/json_flags.go
+++ b/pkg/cmdutil/json_flags.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/cli/cli/pkg/export"
 	"github.com/cli/cli/pkg/jsoncolor"
+	"github.com/cli/cli/pkg/set"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
@@ -36,6 +37,14 @@ func AddJSONFlags(cmd *cobra.Command, exportTarget *Exporter, fields []string) {
 			if export == nil {
 				*exportTarget = nil
 			} else {
+				allowedFields := set.NewStringSet()
+				allowedFields.AddValues(fields)
+				for _, f := range export.fields {
+					if !allowedFields.Contains(f) {
+						sort.Strings(fields)
+						return JSONFlagError{fmt.Errorf("Unknown JSON field: %q\nAvailable fields:\n  %s", f, strings.Join(fields, "\n  "))}
+					}
+				}
 				*exportTarget = export
 			}
 		} else {
diff --git a/pkg/cmdutil/json_flags_test.go b/pkg/cmdutil/json_flags_test.go
new file mode 100644
index 000000000..61780db96
--- /dev/null
+++ b/pkg/cmdutil/json_flags_test.go
@@ -0,0 +1,173 @@
+package cmdutil
+
+import (
+	"bytes"
+	"io/ioutil"
+	"testing"
+
+	"github.com/spf13/cobra"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+func TestAddJSONFlags(t *testing.T) {
+	tests := []struct {
+		name        string
+		fields      []string
+		args        []string
+		wantsExport *exportFormat
+		wantsError  string
+	}{
+		{
+			name:        "no JSON flag",
+			fields:      []string{},
+			args:        []string{},
+			wantsExport: nil,
+		},
+		{
+			name:        "empty JSON flag",
+			fields:      []string{"one", "two"},
+			args:        []string{"--json"},
+			wantsExport: nil,
+			wantsError:  "Specify one or more comma-separated fields for `--json`:\n  one\n  two",
+		},
+		{
+			name:        "invalid JSON field",
+			fields:      []string{"id", "number"},
+			args:        []string{"--json", "idontexist"},
+			wantsExport: nil,
+			wantsError:  "Unknown JSON field: \"idontexist\"\nAvailable fields:\n  id\n  number",
+		},
+		{
+			name:        "cannot combine --json with --web",
+			fields:      []string{"id", "number", "title"},
+			args:        []string{"--json", "id", "--web"},
+			wantsExport: nil,
+			wantsError:  "cannot use `--web` with `--json`",
+		},
+		{
+			name:        "cannot use --jq without --json",
+			fields:      []string{},
+			args:        []string{"--jq", ".number"},
+			wantsExport: nil,
+			wantsError:  "cannot use `--jq` without specifying `--json`",
+		},
+		{
+			name:        "cannot use --template without --json",
+			fields:      []string{},
+			args:        []string{"--template", "{{.number}}"},
+			wantsExport: nil,
+			wantsError:  "cannot use `--template` without specifying `--json`",
+		},
+		{
+			name:   "with JSON fields",
+			fields: []string{"id", "number", "title"},
+			args:   []string{"--json", "number,title"},
+			wantsExport: &exportFormat{
+				fields:   []string{"number", "title"},
+				filter:   "",
+				template: "",
+			},
+		},
+		{
+			name:   "with jq filter",
+			fields: []string{"id", "number", "title"},
+			args:   []string{"--json", "number", "-q.number"},
+			wantsExport: &exportFormat{
+				fields:   []string{"number"},
+				filter:   ".number",
+				template: "",
+			},
+		},
+		{
+			name:   "with Go template",
+			fields: []string{"id", "number", "title"},
+			args:   []string{"--json", "number", "-t", "{{.number}}"},
+			wantsExport: &exportFormat{
+				fields:   []string{"number"},
+				filter:   "",
+				template: "{{.number}}",
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cmd := &cobra.Command{Run: func(*cobra.Command, []string) {}}
+			cmd.Flags().Bool("web", false, "")
+			var exporter Exporter
+			AddJSONFlags(cmd, &exporter, tt.fields)
+			cmd.SetArgs(tt.args)
+			cmd.SetOut(ioutil.Discard)
+			cmd.SetErr(ioutil.Discard)
+			_, err := cmd.ExecuteC()
+			if tt.wantsError == "" {
+				require.NoError(t, err)
+			} else {
+				assert.EqualError(t, err, tt.wantsError)
+				return
+			}
+			if tt.wantsExport == nil {
+				assert.Nil(t, exporter)
+			} else {
+				assert.Equal(t, tt.wantsExport, exporter)
+			}
+		})
+	}
+}
+
+func Test_exportFormat_Write(t *testing.T) {
+	type args struct {
+		data         interface{}
+		colorEnabled bool
+	}
+	tests := []struct {
+		name     string
+		exporter exportFormat
+		args     args
+		wantW    string
+		wantErr  bool
+	}{
+		{
+			name:     "regular JSON output",
+			exporter: exportFormat{},
+			args: args{
+				data:         map[string]string{"name": "hubot"},
+				colorEnabled: false,
+			},
+			wantW:   "{\"name\":\"hubot\"}\n",
+			wantErr: false,
+		},
+		{
+			name:     "with jq filter",
+			exporter: exportFormat{filter: ".name"},
+			args: args{
+				data:         map[string]string{"name": "hubot"},
+				colorEnabled: false,
+			},
+			wantW:   "hubot\n",
+			wantErr: false,
+		},
+		{
+			name:     "with Go template",
+			exporter: exportFormat{template: "{{.name}}"},
+			args: args{
+				data:         map[string]string{"name": "hubot"},
+				colorEnabled: false,
+			},
+			wantW:   "hubot",
+			wantErr: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			w := &bytes.Buffer{}
+			if err := tt.exporter.Write(w, tt.args.data, tt.args.colorEnabled); (err != nil) != tt.wantErr {
+				t.Errorf("exportFormat.Write() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if gotW := w.String(); gotW != tt.wantW {
+				t.Errorf("exportFormat.Write() = %v, want %v", gotW, tt.wantW)
+			}
+		})
+	}
+}