diff --git a/.travis.yml b/.travis.yml
index 9d45f19b..3efa1995 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
   - "pypy"
   - "pypy3"
 
@@ -15,6 +16,7 @@ env:
   - INFLUXDB_VER=1.5.4  # 2018-06-22
   - INFLUXDB_VER=1.6.4  # 2018-10-24
   - INFLUXDB_VER=1.7.4  # 2019-02-14
+  - INFLUXDB_VER=1.8.5  # 2021-04-29
 
 addons:
   apt:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3e86086..4606077d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Amend retry to avoid sleep after last retry before raising exception (#790 thx @krzysbaranski)
 - Remove msgpack pinning for requirements (#818 thx @prometheanfire)
 - Update support for HTTP headers in the InfluxDBClient (#851 thx @bednar)
+- Update test suite to add support for Python 3.8 and InfluxDB v1.8.5 (#856)
 
 ### Removed
 
diff --git a/README.rst b/README.rst
index a40ed148..26b0ac94 100644
--- a/README.rst
+++ b/README.rst
@@ -39,7 +39,7 @@ InfluxDB is an open-source distributed time series database, find more about Inf
 InfluxDB pre v1.1.0 users
 -------------------------
 
-This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3, v1.5.4, v1.6.4, and 1.7.4.
+This module is tested with InfluxDB versions: v1.2.4, v1.3.9, v1.4.3, v1.5.4, v1.6.4, v1.7.4 and v1.8.5.
 
 Those users still on InfluxDB v0.8.x users may still use the legacy client by importing ``from influxdb.influxdb08 import InfluxDBClient``.
 
@@ -59,7 +59,7 @@ On Debian/Ubuntu, you can install it with this command::
 Dependencies
 ------------
 
-The influxdb-python distribution is supported and tested on Python 2.7, 3.5, 3.6, 3.7, PyPy and PyPy3.
+The influxdb-python distribution is supported and tested on Python 2.7, 3.5, 3.6, 3.7, 3.8, PyPy and PyPy3.
 
 **Note:** Python <3.5 are currently untested. See ``.travis.yml``.
 
diff --git a/influxdb/_dataframe_client.py b/influxdb/_dataframe_client.py
index e7ae9c17..1363cbf0 100644
--- a/influxdb/_dataframe_client.py
+++ b/influxdb/_dataframe_client.py
@@ -305,7 +305,7 @@ def _convert_dataframe_to_json(dataframe,
              'time': np.int64(ts.value / precision_factor)}
             for ts, tag, (_, rec) in zip(
                 dataframe.index,
-                dataframe[tag_columns].to_dict('record'),
+                dataframe[tag_columns].to_dict('records'),
                 dataframe[field_columns].iterrows()
             )
         ]
diff --git a/setup.py b/setup.py
index d44875f6..a934535c 100755
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,8 @@
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
diff --git a/tox.ini b/tox.ini
index 1e59b415..edff1172 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, py37, pypy, pypy3, flake8, pep257, coverage, docs, mypy
+envlist = py27, py35, py36, py37, py38, pypy, pypy3, flake8, pep257, coverage, docs, mypy
 
 [testenv]
 passenv = INFLUXDB_PYTHON_INFLUXD_PATH
@@ -14,6 +14,8 @@ deps = -r{toxinidir}/requirements.txt
        py36: numpy==1.15.4
        py37: pandas==0.24.2
        py37: numpy==1.16.2
+       py38: pandas==1.1.2
+       py38: numpy==1.19.0
 # Only install pandas with non-pypy interpreters
 # Testing all combinations would be too expensive
 commands = nosetests -v --with-doctest {posargs}