diff --git a/.travis.yml b/.travis.yml
index 335196c9..9cb9b31a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,15 @@ python:
     - 3.4
     - 3.5
     - 3.6
-install:
+matrix:
+    include:
+        - python: "3.7"
+          dist: xenial
+          sudo: true
+before_install:
     - pip install -U pip setuptools
     - pip install -U coverage coveralls zope.testrunner
+install:
     - pip install -U -e .[test]
 script:
     - coverage run -m zope.testrunner --test-path=src
diff --git a/CHANGES.rst b/CHANGES.rst
index 1fc12264..6a7aa068 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,8 @@ Changelog
 4.1 (unreleased)
 ----------------
 
+- Add support for Python 3.7.
+
 - Deal with items with same name but different values in ordered field widget.
   [rodfersou]
 
diff --git a/setup.py b/setup.py
index 1099ab21..e68384f9 100644
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@ def alltests():
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: Implementation :: CPython',
         'Natural Language :: English',
         'Operating System :: OS Independent',
diff --git a/src/z3c/form/converter.rst b/src/z3c/form/converter.rst
index 73e0b15e..ed1fbd4f 100644
--- a/src/z3c/form/converter.rst
+++ b/src/z3c/form/converter.rst
@@ -400,8 +400,9 @@ Dates are simply converted to ISO format:
 The converter only knows how to convert this particular format back to a
 datetime value:
 
-  >>> tddc.toFieldValue(u'1 day, 1:01:01')
-  datetime.timedelta(1, 3661)
+  >>> fv = tddc.toFieldValue(u'1 day, 1:01:01')
+  >>> (fv.days, fv.seconds)
+  (1, 3661)
 
 If no day is available, the following short form is used:
 
@@ -411,8 +412,9 @@ If no day is available, the following short form is used:
 
 And now back to the field value:
 
-  >>> tddc.toFieldValue(u'1:01:01')
-  datetime.timedelta(0, 3661)
+  >>> fv = tddc.toFieldValue(u'1:01:01')
+  >>> (fv.days, fv.seconds)
+  (0, 3661)
 
 By default the converter converts missing input to missin_input value:
 
diff --git a/tox.ini b/tox.ini
index 4381c152..1ac30ae4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,py36,coverage,docs
+    py27,py34,py35,py36,py37,coverage,docs
 
 [testenv]
 commands =