diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index f64b5e8e07..82b0a9b9f5 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -66,7 +66,6 @@ _treeList = [
 
     # core controls
     ('Core Windows/Controls', [
-        'VirtualListCtrl',
         'wxButton',
         'wxCheckBox',
         'wxCheckListBox',
@@ -77,6 +76,7 @@ _treeList = [
         'wxGrid',
         'wxListBox',
         'wxListCtrl',
+        'wxListCtrl_virtual',
         'wxNotebook',
         'wxPopupWindow',
         'wxRadioBox',
diff --git a/wxPython/demo/wxEditor.py b/wxPython/demo/wxEditor.py
index d3bbd08785..2ee5c23c6b 100644
--- a/wxPython/demo/wxEditor.py
+++ b/wxPython/demo/wxEditor.py
@@ -62,3 +62,9 @@ SetAltFuncs() method.
 
 
 
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+
diff --git a/wxPython/demo/VirtualListCtrl.py b/wxPython/demo/wxListCtrl_virtual.py
similarity index 95%
rename from wxPython/demo/VirtualListCtrl.py
rename to wxPython/demo/wxListCtrl_virtual.py
index b30b4caf4c..3e9a8fa7c1 100644
--- a/wxPython/demo/VirtualListCtrl.py
+++ b/wxPython/demo/wxListCtrl_virtual.py
@@ -1,5 +1,4 @@
 
-
 from wxPython.wx import *
 
 #----------------------------------------------------------------------
@@ -77,8 +76,13 @@ def runTest(frame, nb, log):
 
 
 
-
-
-
 overview = """\
 """
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+