diff --git a/CHANGES.rst b/CHANGES.rst
index fbe6e6c..a83a3f8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,14 @@
 Changelog
 =========
 
-3.1.0
+4.0.0
 -----
 
 - Add config option to select cipher for ssh connection (dasm)
+- Fix deprecation warnings for pytest (dasm)
+- Support pytest-xdist >= 1.26.0 (dasm)
+- Support pytest >= 3.6.1 (dasm)
+- Remove support for Python 3.0, 3.1, 3.2, 3.3 (consistent with pytest-xdist) (dasm)
 
 3.0.1
 -----
diff --git a/pytest_cloud/__init__.py b/pytest_cloud/__init__.py
index deb97c8..19b0c03 100644
--- a/pytest_cloud/__init__.py
+++ b/pytest_cloud/__init__.py
@@ -1,3 +1,3 @@
 """PyTest Cloud."""
 
-__version__ = '3.0.1'
+__version__ = '4.0.0'
diff --git a/pytest_cloud/patches.py b/pytest_cloud/patches.py
index 0a69e0b..cf33669 100644
--- a/pytest_cloud/patches.py
+++ b/pytest_cloud/patches.py
@@ -80,7 +80,7 @@ def setup(self):
         self.channel.setcallback(
             self.process_from_remote,
             endmarker=self.ENDMARK)
-    self.channel.send((self.slaveinput, args, option_dict))
+    self.channel.send((self.slaveinput, args, option_dict, None))
 
 
 def apply_patches():
diff --git a/pytest_cloud/plugin.py b/pytest_cloud/plugin.py
index 3413df6..86d9276 100644
--- a/pytest_cloud/plugin.py
+++ b/pytest_cloud/plugin.py
@@ -81,7 +81,7 @@ def pytest_addoption(parser):
     group.addoption(
         "--cloud-python",
         help="python executable name to be used on the remote test nodes."
-        "Default is the executable used on the master.", type='string', action="store",
+        "Default is the executable used on the master.", type=str, action="store",
         dest='cloud_python', metavar="NAME", default='python{0}.{1}'.format(*sys.version_info))
     group._addoption(
         '--cloud-chdir',
@@ -95,31 +95,31 @@ def pytest_addoption(parser):
         help="relative path on remote node to run tests in. Default is pytest_<username>_<current_folder_name>")
     group.addoption(
         "--cloud-nodes",
-        help="space-separated test node list to use for distributed testing", type='string', action=NodesAction,
+        help="space-separated test node list to use for distributed testing", type=str, action=NodesAction,
         dest='cloud_nodes', metavar="'USER@HOST", default=[])
     group.addoption(
         "--cloud-node",
-        help="test node to use for distributed testing", type='string', action="append",
+        help="test node to use for distributed testing", type=str, action="append",
         dest='cloud_nodes', metavar="USER@HOST", default=[])
     group.addoption(
         "--cloud-virtualenv-path",
-        help="relative path to the virtualenv to be used on the remote test nodes.", type='string', action="store",
+        help="relative path to the virtualenv to be used on the remote test nodes.", type=str, action="store",
         dest='cloud_virtualenv_path', metavar="PATH", default=get_virtualenv_path())
     group.addoption(
         "--cloud-mem-per-process",
-        help="amount of memory roughly needed for test process, in megabytes", type='int', action="store",
+        help="amount of memory roughly needed for test process, in megabytes", type=int, action="store",
         dest='cloud_mem_per_process', metavar="NUMBER", default=None)
     group.addoption(
         "--cloud-max-processes",
-        help="maximum number of processes per test node", type='int', action="store",
+        help="maximum number of processes per test node", type=int, action="store",
         dest='cloud_max_processes', metavar="NUMBER", default=None)
     group.addoption(
         "--cloud-rsync-max-processes",
-        help="maximum number of rsync processes", type='int', action="store",
+        help="maximum number of rsync processes", type=int, action="store",
         dest='cloud_rsync_max_processes', metavar="NUMBER", default=None)
     group.addoption(
         "--cloud-rsync-bandwidth-limit",
-        help="maximum number of processes per test node", type='int', action="store",
+        help="maximum number of processes per test node", type=int, action="store",
         dest='cloud_rsync_bandwidth_limit', metavar="NUMBER", default=10000)
     parser.addoption(
         "--cloud-rsync-cipher",
diff --git a/setup.py b/setup.py
index 361f407..3c9a355 100755
--- a/setup.py
+++ b/setup.py
@@ -27,12 +27,13 @@
     url='https://github.com/pytest-dev/pytest-cloud',
     install_requires=[
         'psutil',
-        'pytest>=2.7.0',
-        'pytest-xdist>=1.22.1',
+        'pytest>=3.6.1',
+        'pytest-xdist>=1.26.0',
         'setuptools',
         'six',
         'timeout-decorator>=0.3.2',
     ],
+    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
     classifiers=[
         'Development Status :: 6 - Mature',
         'Intended Audience :: Developers',
@@ -45,7 +46,7 @@
         'Topic :: Utilities',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 3',
-    ] + [('Programming Language :: Python :: %s' % x) for x in '2.7 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7'.split()],
+    ] + [('Programming Language :: Python :: %s' % x) for x in '2.7 3 3.4 3.5 3.6 3.7'.split()],
     tests_require=['tox'],
     entry_points={'pytest11': [
         'pytest-cloud=pytest_cloud.plugin',