diff --git a/.appveyor.yml b/.appveyor.yml
index cb9efe5aeb..0d12eeed7e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -37,6 +37,13 @@ environment:
       PANDAS_DATAREADER_VERSION: "0.4.0"
       DASK_VERSION: "0.17.1"
 
+    - PYTHON_VERSION: "3.6"
+      PANDAS_VERSION: "0.22.0"
+      NUMPY_VERSION: "1.14.1"
+      SCIPY_VERSION: "1.0.0"
+      PANDAS_DATAREADER_VERSION: "0.4.0"
+      DASK_VERSION: "0.17.1"
+
 # We always use a 64-bit machine, but can build x86 distributions
 # with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
 platform:
diff --git a/.travis.yml b/.travis.yml
index 08f61c1c36..4ded304ac4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ fast_finish: true
 python:
   - 2.7
   - 3.5
+  - 3.6
 env:
   global:
     # 1. Generated a token for travis at https://anaconda.org/quantopian/settings/access with scope api:write.
@@ -24,6 +25,8 @@ matrix:
   exclude:
     - python: 2.7
       env: NEW_PANDAS=1
+    - python: 3.6
+      env: OLD_PANDAS=1
 #  include:
 #    # Workaround Travis OSX not natively supporting Python.
 #    - os: osx
diff --git a/etc/conda_build_matrix.py b/etc/conda_build_matrix.py
index 5c0a02962b..7f4b2f6eb6 100644
--- a/etc/conda_build_matrix.py
+++ b/etc/conda_build_matrix.py
@@ -4,7 +4,7 @@
 
 import click
 
-py_versions = ('2.7', '3.4', '3.5')
+py_versions = ('2.7', '3.4', '3.5', '3.6')
 npy_versions = ('1.9', '1.10')
 zipline_path = os.path.join(
     os.path.dirname(__file__),
diff --git a/setup.py b/setup.py
index c21b0855bb..e0226c1e43 100644
--- a/setup.py
+++ b/setup.py
@@ -314,6 +314,7 @@ def setup_requirements(requirements_path, module_names, strict_bounds,
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Operating System :: OS Independent',
         'Intended Audience :: Science/Research',
         'Topic :: Office/Business :: Financial',