diff --git a/wxPython/demo/TreeMixin.py b/wxPython/demo/TreeMixin.py
index 7c31599a3f..059ddd6179 100644
--- a/wxPython/demo/TreeMixin.py
+++ b/wxPython/demo/TreeMixin.py
@@ -1,6 +1,10 @@
 import wx, wx.lib.customtreectrl, wx.gizmos
-import treemixin
+try:
+    import treemixin 
+except ImportError:
+    from wx.lib.mixins import treemixin
 
+overview = treemixin.__doc__
 
 class TreeModel(object):
     ''' TreeModel holds the domain objects that are shown in the different
diff --git a/wxPython/tests/TreeMixinTest.py b/wxPython/tests/TreeMixinTest.py
index 1153f0243f..ac7909836e 100644
--- a/wxPython/tests/TreeMixinTest.py
+++ b/wxPython/tests/TreeMixinTest.py
@@ -1,4 +1,9 @@
-import wx, wx.gizmos, wx.lib.customtreectrl, unittest, treemixin
+import wx, wx.gizmos, wx.lib.customtreectrl, unittest
+try:
+    import treemixin 
+except ImportError:
+    from wx.lib.mixins import treemixin
+
 
 
 # VirtualTree tests