diff --git a/.travis.yml b/.travis.yml
index 5c2d9ab95..d0cb08029 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -86,6 +86,7 @@ matrix:
         - PYTHON_BUILD=true
         - BREW_BUNDLE=false
         - CC=clang
+        - CXX=clang++
 
     - name: "klayout python3.6 package"
       os: linux
diff --git a/setup.py b/setup.py
index f7b4d2c44..211d6a257 100644
--- a/setup.py
+++ b/setup.py
@@ -149,7 +149,7 @@ class Config(object):
             return []
         else:
             return ["-Wno-strict-aliasing",  # Avoids many "type-punned pointer" warnings
-                    "-std=c++0x",  # because we use unordered_map/unordered_set
+                    "-std=c++11",  # because we use unordered_map/unordered_set
                     ]
 
     def link_args(self, mod):