diff --git a/homeassistant/components/influxdb.py b/homeassistant/components/influxdb.py
index dc790cd54b0..2f6be852cea 100644
--- a/homeassistant/components/influxdb.py
+++ b/homeassistant/components/influxdb.py
@@ -112,6 +112,10 @@ def setup(hass, config):
             }
         ]
 
+        for key, value in state.attributes.items():
+            if key != 'unit_of_measurement':
+                json_body[0]['fields'][key] = value
+
         json_body[0]['tags'].update(tags)
 
         try:
diff --git a/tests/components/test_influxdb.py b/tests/components/test_influxdb.py
index 21aae5b0b04..7aa4fd616a9 100644
--- a/tests/components/test_influxdb.py
+++ b/tests/components/test_influxdb.py
@@ -101,7 +101,11 @@ class TestInfluxDB(unittest.TestCase):
                  STATE_OFF: 0,
                  'foo': 'foo'}
         for in_, out in valid.items():
-            attrs = {'unit_of_measurement': 'foobars'}
+            attrs = {
+                        'unit_of_measurement': 'foobars',
+                        'longitude': '1.1',
+                        'latitude': '2.2'
+                    }
             state = mock.MagicMock(state=in_,
                                    domain='fake',
                                    object_id='entity',
@@ -117,6 +121,8 @@ class TestInfluxDB(unittest.TestCase):
                 'time': 12345,
                 'fields': {
                     'value': out,
+                    'longitude': '1.1',
+                    'latitude': '2.2'
                 },
             }]
             self.handler_method(event)