diff --git a/query/querytest/query_test.go b/query/querytest/query_test.go
index 94fc268bfb..b1d2a43301 100644
--- a/query/querytest/query_test.go
+++ b/query/querytest/query_test.go
@@ -21,6 +21,7 @@ var skipTests = map[string]string{
 	"window":                    "ordering of results differs between queries (https://github.com/influxdata/platform/issues/96)",
 	"window_group_mean_ungroup": "error in influxql: failed to run query: timeValue column \"_start\" does not exist (https://github.com/influxdata/platform/issues/97)",
 	"string_max":                "panic because no max() implementation for string (https://github.com/influxdata/platform/issues/352)",
+	"null_as_value":             "null not supported as value in influxql",
 }
 
 func Test_QueryEndToEnd(t *testing.T) {
diff --git a/query/querytest/test_cases/null_as_ident.flux b/query/querytest/test_cases/null_as_ident.flux
new file mode 100644
index 0000000000..eb58b91d24
--- /dev/null
+++ b/query/querytest/test_cases/null_as_ident.flux
@@ -0,0 +1,3 @@
+null = "test"
+from(db: null)
+	|> range(start:-5m)
\ No newline at end of file
diff --git a/query/querytest/test_cases/null_as_ident.in.csv b/query/querytest/test_cases/null_as_ident.in.csv
new file mode 100644
index 0000000000..047bf906a6
--- /dev/null
+++ b/query/querytest/test_cases/null_as_ident.in.csv
@@ -0,0 +1,10 @@
+#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string,string,string
+#partition,false,false,false,false,false,false,true,true,true,true,true,true
+#default,_result,,,,,,,,,,,
+,result,table,_start,_stop,_time,_value,_field,_measurement,device,fstype,host,path
+,,97,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,318324641792,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,97,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,318324609024,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,97,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:46Z,318324129792,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,97,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:56Z,318324129792,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,97,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,318326116352,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,97,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,318325084160,free,disk,disk1s4,apfs,host.local,/private/var/vm
\ No newline at end of file
diff --git a/query/querytest/test_cases/null_as_ident.out.csv b/query/querytest/test_cases/null_as_ident.out.csv
new file mode 100644
index 0000000000..d1b0f79c35
--- /dev/null
+++ b/query/querytest/test_cases/null_as_ident.out.csv
@@ -0,0 +1,11 @@
+#datatype,string,long,dateTime:RFC3339,dateTime:RFC3339,dateTime:RFC3339,long,string,string,string,string,string,string
+#partition,false,false,false,false,false,false,true,true,true,true,true,true
+#default,_result,,,,,,,,,,,
+,result,table,_start,_stop,_time,_value,_field,_measurement,device,fstype,host,path
+,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:26Z,318324641792,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:36Z,318324609024,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:46Z,318324129792,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:53:56Z,318324129792,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:06Z,318326116352,free,disk,disk1s4,apfs,host.local,/private/var/vm
+,,0,2018-05-22T19:53:24.421470485Z,2018-05-22T19:54:24.421470485Z,2018-05-22T19:54:16Z,318325084160,free,disk,disk1s4,apfs,host.local,/private/var/vm
+
diff --git a/query/querytest/test_cases/null_as_value.flux b/query/querytest/test_cases/null_as_value.flux
new file mode 100644
index 0000000000..1dd0f93de1
--- /dev/null
+++ b/query/querytest/test_cases/null_as_value.flux
@@ -0,0 +1,3 @@
+db = null 
+from(db: db)
+	|> range(start:-5m) 
diff --git a/query/querytest/test_cases/null_as_value.in.csv b/query/querytest/test_cases/null_as_value.in.csv
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/query/querytest/test_cases/null_as_value.out.csv b/query/querytest/test_cases/null_as_value.out.csv
new file mode 100644
index 0000000000..291b59f2f9
--- /dev/null
+++ b/query/querytest/test_cases/null_as_value.out.csv
@@ -0,0 +1 @@
+Null as value unimplemented