diff --git a/influxdb/client.py b/influxdb/client.py
index 3ddd794d..8b4d7a43 100755
--- a/influxdb/client.py
+++ b/influxdb/client.py
@@ -295,7 +295,8 @@ def get_list_database(self):
         """
         Get the list of databases
         """
-        return [db['name'] for db in self.query("SHOW DATABASES")]
+        rsp = self.query("SHOW DATABASES")
+        return [db['name'] for db in rsp['databases']]
 
     def create_database(self, dbname):
         """
diff --git a/tests/influxdb/client_test.py b/tests/influxdb/client_test.py
index 3f0a08fb..01550b9c 100644
--- a/tests/influxdb/client_test.py
+++ b/tests/influxdb/client_test.py
@@ -350,14 +350,9 @@ def test_drop_database_fails(self):
             cli.drop_database('old_db')
 
     def test_get_list_database(self):
-        data = {
-            "results":
-            [
-                {"series": [
-                    {"columns": ["name"],
-                     "values":[["mydb"], ["myotherdb"]]}]}
-            ]
-        }
+        data = {'results': [{'series': [
+            {'name': 'databases', 'columns': ['name'],
+             'values': [['mydb'], ['myotherdb']]}]}]}
 
         with _mocked_session('get', 200, json.dumps(data)):
             self.assertListEqual(