diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml
index 47b39c44a..ad3d9cb13 100644
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@@ -12,7 +12,7 @@ build:
 
 requirements:
   run:
-    - python 3.5.2
+    - python >=3.5.2,<3.6
     - setuptools
     - migen 0.4
     - misoc 0.3
diff --git a/conda/artiq-doc.yaml b/conda/artiq-doc.yaml
index 5ebedd859..a51c2e18b 100644
--- a/conda/artiq-doc.yaml
+++ b/conda/artiq-doc.yaml
@@ -6,7 +6,7 @@ channels:
   - m-labs/label/main
   - defaults
 dependencies:
-  - python=3.5.2
+  - python>=3.5.2,<3.6
   - sphinx=1.4.8
   - sphinx-argparse
   - sphinxcontrib-wavedrom
diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
index d1ead184a..5bdbba56a 100644
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@@ -12,10 +12,10 @@ build:
 
 requirements:
   build:
-    - python 3.5.2
+    - python >=3.5.2,<3.6
     - setuptools
   run:
-    - python 3.5.2
+    - python >=3.5.2,<3.6
     - llvmlite-artiq 0.10.0.dev py35_24
     - binutils-or1k-linux
     - pythonparser 1.0
diff --git a/setup.py b/setup.py
index 7e39e23ae..cc337153e 100755
--- a/setup.py
+++ b/setup.py
@@ -6,8 +6,8 @@ import sys
 import versioneer
 
 
-if sys.version_info[:3] < (3, 5, 2):
-    raise Exception("You need Python 3.5.2+")
+if not (3, 5, 2) <= sys.version_info[:3] < (3, 6, 0):
+    raise Exception("You need Python 3.5.2+ (but not 3.6)")
 
 
 # Depends on PyQt5, but setuptools cannot check for it.