diff --git a/cmd/influxd/server_integration_test.go b/cmd/influxd/server_integration_test.go
index a3921c5423..ff7a92fffd 100644
--- a/cmd/influxd/server_integration_test.go
+++ b/cmd/influxd/server_integration_test.go
@@ -579,6 +579,16 @@ func runTestsData(t *testing.T, testName string, nodes Cluster, database, retent
 		},
 
 		// Aggregations
+		{
+			reset: true,
+			name:  "stddev with just one point",
+			write: `{"database" : "%DB%", "retentionPolicy" : "%RP%", "points": [
+				{"name": "cpu", "timestamp": "2015-04-20T14:27:41Z", "fields": {"value": 45}}
+			]}`,
+			query:    `SELECT stddev(value) FROM cpu`,
+			queryDb:  "%DB%",
+			expected: `{"results":[{"series":[{"name":"cpu","columns":["time","stddev"],"values":[["1970-01-01T00:00:00Z",null]]}]}]}`,
+		},
 		{
 			reset: true,
 			name:  "large mean and stddev",