diff --git a/bigquery/setup.py b/bigquery/setup.py
index 98aea8dbe15b..a9a7e9002b03 100644
--- a/bigquery/setup.py
+++ b/bigquery/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/bigquery/tox.ini b/bigquery/tox.ini
index 2d142ba71df6..57c77f8ecc77 100644
--- a/bigquery/tox.ini
+++ b/bigquery/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/bigtable/setup.py b/bigtable/setup.py
index 08cd2eb7d6b4..7c563becdb68 100644
--- a/bigtable/setup.py
+++ b/bigtable/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/bigtable/tox.ini b/bigtable/tox.ini
index 257e21288b27..c649f5bf0b13 100644
--- a/bigtable/tox.ini
+++ b/bigtable/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/core/setup.py b/core/setup.py
index 0713f23cc27d..539279afd8b3 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/core/tox.ini b/core/tox.ini
index 156ffc07e00e..51ec80b563d0 100644
--- a/core/tox.ini
+++ b/core/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 deps =
diff --git a/datastore/setup.py b/datastore/setup.py
index 951551a9fdb8..18f6dea3ff60 100644
--- a/datastore/setup.py
+++ b/datastore/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/datastore/tox.ini b/datastore/tox.ini
index 76ffb1f2a8b5..e65b5b60832a 100644
--- a/datastore/tox.ini
+++ b/datastore/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/dns/setup.py b/dns/setup.py
index 236361f6b721..8523cc4d56fb 100644
--- a/dns/setup.py
+++ b/dns/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/dns/tox.ini b/dns/tox.ini
index f4dd23f414cb..bec79e3175b9 100644
--- a/dns/tox.ini
+++ b/dns/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/error_reporting/setup.py b/error_reporting/setup.py
index 9d65198d9af6..5b16f8660d71 100644
--- a/error_reporting/setup.py
+++ b/error_reporting/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/error_reporting/tox.ini b/error_reporting/tox.ini
index e18578ba64ac..4743a3b7ed22 100644
--- a/error_reporting/tox.ini
+++ b/error_reporting/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/language/setup.py b/language/setup.py
index 4d6a2104f5b9..e7c6962f983f 100644
--- a/language/setup.py
+++ b/language/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/language/tox.ini b/language/tox.ini
index 3f9f18cb23ea..8c3b140f0bff 100644
--- a/language/tox.ini
+++ b/language/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/logging/setup.py b/logging/setup.py
index 98645b8ea1e8..4d10e761e6bb 100644
--- a/logging/setup.py
+++ b/logging/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/logging/tox.ini b/logging/tox.ini
index db3e8a654954..805083a2947c 100644
--- a/logging/tox.ini
+++ b/logging/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/monitoring/setup.py b/monitoring/setup.py
index f20378bc45b1..b74e51ca751a 100644
--- a/monitoring/setup.py
+++ b/monitoring/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/monitoring/tox.ini b/monitoring/tox.ini
index f9ba521efeed..c33582110e66 100644
--- a/monitoring/tox.ini
+++ b/monitoring/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover,{py27,py34,py35}-{pandas}
+    py27,py34,py35,py36,cover,{py27,py34,py35,py36}-{pandas}
 
 [testing]
 localdeps =
diff --git a/pubsub/setup.py b/pubsub/setup.py
index 3d713235e7a8..f528a6e3de98 100644
--- a/pubsub/setup.py
+++ b/pubsub/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/pubsub/tox.ini b/pubsub/tox.ini
index 001886c51e9a..bdb4eb93f523 100644
--- a/pubsub/tox.ini
+++ b/pubsub/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/resource_manager/setup.py b/resource_manager/setup.py
index 66ffd9ccd2cc..747150655bc5 100644
--- a/resource_manager/setup.py
+++ b/resource_manager/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/resource_manager/tox.ini b/resource_manager/tox.ini
index 9e1f41a089d3..9f5bc879f841 100644
--- a/resource_manager/tox.ini
+++ b/resource_manager/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/runtimeconfig/setup.py b/runtimeconfig/setup.py
index 37fe51eef504..bf9667581044 100644
--- a/runtimeconfig/setup.py
+++ b/runtimeconfig/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/runtimeconfig/tox.ini b/runtimeconfig/tox.ini
index 03a0428a1ee0..d4b1a1e51cd6 100644
--- a/runtimeconfig/tox.ini
+++ b/runtimeconfig/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/scripts/run_unit_tests.py b/scripts/run_unit_tests.py
index 8ff3d20a984b..10ca2d96fb3b 100644
--- a/scripts/run_unit_tests.py
+++ b/scripts/run_unit_tests.py
@@ -48,6 +48,7 @@
     (2, 7): 'py27',
     (3, 4): 'py34',
     (3, 5): 'py35',
+    (3, 6): 'py36',
 }
 UNSET_SENTINEL = object()  # Sentinel for argparser
 
diff --git a/setup.py b/setup.py
index 9937aabb97c6..e4212c8cb78d 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,6 @@
 
 import os
 
-from setuptools import find_packages
 from setuptools import setup
 
 
@@ -44,6 +43,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/speech/setup.py b/speech/setup.py
index aa8796d18b57..e4274894706d 100644
--- a/speech/setup.py
+++ b/speech/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/speech/tox.ini b/speech/tox.ini
index 4ded9cd86434..7b6373ee9eb0 100644
--- a/speech/tox.ini
+++ b/speech/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/storage/setup.py b/storage/setup.py
index 63ac393e4c20..ce52fc504f5f 100644
--- a/storage/setup.py
+++ b/storage/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/storage/tox.ini b/storage/tox.ini
index 21a37c145f0e..8000c8a298b7 100644
--- a/storage/tox.ini
+++ b/storage/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/tox.ini b/tox.ini
index 043c424d05a1..de57de1be34d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover,docs,lint
+    py27,py34,py35,py36,cover,docs,lint
 
 [testing]
 deps =
@@ -151,6 +151,7 @@ skip_install =
     py27: True
     py34: True
     py35: True
+    py36: True
     cover: True
     lint: True
 passenv =
diff --git a/translate/setup.py b/translate/setup.py
index d57f326631c3..880553b16047 100644
--- a/translate/setup.py
+++ b/translate/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/translate/tox.ini b/translate/tox.ini
index c51673432353..877176ee70cc 100644
--- a/translate/tox.ini
+++ b/translate/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =
diff --git a/vision/setup.py b/vision/setup.py
index 7915c92850ad..e7ac153c4bd9 100644
--- a/vision/setup.py
+++ b/vision/setup.py
@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet',
     ],
 }
diff --git a/vision/tox.ini b/vision/tox.ini
index e0d8c2b172de..e5d99d78526a 100644
--- a/vision/tox.ini
+++ b/vision/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py27,py34,py35,cover
+    py27,py34,py35,py36,cover
 
 [testing]
 localdeps =