diff --git a/python/setup.py b/python/setup.py
index 1ff5b9d..9a7eadd 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -151,8 +151,10 @@
   warnings_as_errors = '--warnings_as_errors'
   if cpp_impl in sys.argv:
     sys.argv.remove(cpp_impl)
-    extra_compile_args = ['-Wno-write-strings', '-Wno-shorten-64-to-32',
-                          '-Wno-invalid-offsetof']
+    extra_compile_args = ['-Wno-write-strings', '-Wno-invalid-offsetof']
+
+    if "clang" in os.popen('$CC --version').read():
+      extra_compile_args.append('-Wno-shorten-64-to-32')
 
     if warnings_as_errors in sys.argv:
       extra_compile_args.append('-Werror')
diff --git a/python/tox.ini b/python/tox.ini
index 7deb3ba..74b2ac0 100644
--- a/python/tox.ini
+++ b/python/tox.ini
@@ -1,7 +1,5 @@
 [tox]
 envlist =
-    # cpp implementation on py34 is currently broken due to
-    # changes introduced by http://bugs.python.org/issue22079.
     py{26,27,33,34}-{cpp,python}
 
 [testenv]