--- a/components/python/python27/python-27.p5m	Wed Dec 16 10:47:40 2015 -0800
+++ b/components/python/python27/python-27.p5m	Wed Dec 16 13:55:13 2015 -0800
@@ -1032,3 +1032,7 @@
 
 # This optionally brings in the python tk support if tk is installed
 depend type=conditional fmri=library/python/tkinter-27 predicate=runtime/tk-8
+
+# A file was moved from the tests package with the 2.7.11 upgrade, so force
+# that version if the tests are installed to avoid a conflict.
+depend type=optional fmri=runtime/python-27/[email protected]