diff --git a/tests/run/cpp_classes_def.pyx b/tests/run/cpp_classes_def.pyx
index 52a498faa83c7856761976f5ff4cb9906f3e1d3d..0377fc1f645577f62c899e4c4dfad630864fb40e 100644
--- a/tests/run/cpp_classes_def.pyx
+++ b/tests/run/cpp_classes_def.pyx
@@ -1,7 +1,6 @@
 # mode: run
-# tag: cpp, werror
+# tag: cpp, werror, cpp11
 # cython: experimental_cpp_class_def=True
-# distutils: extra_compile_args=-std=c++0x
 
 cdef double pi
 from math import pi
diff --git a/tests/run/cpp_smart_ptr.pyx b/tests/run/cpp_smart_ptr.pyx
index e6f2a53ccf6a300cc850c5b8600d6907cce274e6..7a249fbd3e1da8b50d28e6a1f003012c7d310884 100644
--- a/tests/run/cpp_smart_ptr.pyx
+++ b/tests/run/cpp_smart_ptr.pyx
@@ -1,6 +1,5 @@
 # mode: run
 # tag: cpp, werror, cpp11
-# distutils: extra_compile_args=-std=c++0x
 
 from libcpp.memory cimport unique_ptr, shared_ptr, default_delete, dynamic_pointer_cast
 from libcpp cimport nullptr
diff --git a/tests/run/cpp_stl_conversion.pyx b/tests/run/cpp_stl_conversion.pyx
index e22546a18b9b51eba7b7195f5de9a45ca8d90a96..578915a0b727eb15670dc34edab9ba8a19dcc602 100644
--- a/tests/run/cpp_stl_conversion.pyx
+++ b/tests/run/cpp_stl_conversion.pyx
@@ -1,6 +1,5 @@
 # mode: run
-# tag: cpp, werror
-# distutils: extra_compile_args=-std=c++0x
+# tag: cpp, werror, cpp11
 
 import sys
 from libcpp.map cimport map
diff --git a/tests/run/cpp_stl_cpp11.pyx b/tests/run/cpp_stl_cpp11.pyx
index 8220d57eaf7c8f22995c77e31168ab50a9ffb192..618e117f1ec6c05ddb9930c10d9a6a4f28b0a069 100644
--- a/tests/run/cpp_stl_cpp11.pyx
+++ b/tests/run/cpp_stl_cpp11.pyx
@@ -1,6 +1,5 @@
 # mode: run
 # tag: cpp, werror, cpp11
-# distutils: extra_compile_args=-std=c++0x
 
 import sys
 from libcpp.unordered_map cimport unordered_map
diff --git a/tests/run/cpp_stl_function.pyx b/tests/run/cpp_stl_function.pyx
index 6f7a532dbc497ab91051570d5fab9d32a94ec940..723773481f73047babf3cbacf594bfd6fe360828 100644
--- a/tests/run/cpp_stl_function.pyx
+++ b/tests/run/cpp_stl_function.pyx
@@ -1,6 +1,5 @@
-# distutils: extra_compile_args=-std=c++0x
 # mode: run
-# tag: cpp
+# tag: cpp, cpp11
 
 from libcpp.functional cimport function
 cimport cpp_function_lib
diff --git a/tests/run/cpp_stl_string_cpp11.pyx b/tests/run/cpp_stl_string_cpp11.pyx
index bd8524c08ab321d588959a4f82a71121a953c2c1..c8cc785932bf7fd6813a5eb2d43cbfa7d78a3aaa 100644
--- a/tests/run/cpp_stl_string_cpp11.pyx
+++ b/tests/run/cpp_stl_string_cpp11.pyx
@@ -1,6 +1,5 @@
 # mode: run
 # tag: cpp, werror, cpp11
-# distutils: extra_compile_args=-std=c++11
 
 from libcpp.string cimport string