diff --git a/wxPython/misc/widgetLayoutTest.cfg b/wxPython/misc/widgetLayoutTest.cfg
index fb7e4bda01..98a59ec664 100644
--- a/wxPython/misc/widgetLayoutTest.cfg
+++ b/wxPython/misc/widgetLayoutTest.cfg
@@ -37,4 +37,6 @@
 ['wx', 'Slider', '-1, 20, 0, 100, style=wx.SL_VERTICAL|wx.SL_LABELS', ''],
 ['wx', 'Panel', 'size=(150,150)', ''],
 ['wx', 'StaticText', '-1, "normal"', ''],
+['wx', 'StaticText', '-1, "New font"', 'f = wx.Font(18, wx.SWISS, wx.NORMAL, wx.BOLD)\nw.SetFont(f)\n'],
+['wx', 'StaticText', '-1, "normal"', 'w.SetLabel("This is a longer label")'],
 ]
diff --git a/wxPython/misc/widgetLayoutTest.py b/wxPython/misc/widgetLayoutTest.py
index b2bea7a791..ebe741b6c2 100644
--- a/wxPython/misc/widgetLayoutTest.py
+++ b/wxPython/misc/widgetLayoutTest.py
@@ -295,6 +295,7 @@ class LayoutTestFrame(wx.Frame):
                 wx.MessageBox("Got a '%s' Exception!" % e.__class__.__name__, "Error")
                 import traceback
                 traceback.print_exc()
+                w.Destroy()
                 return
             
         # Put the widget in a sizer and the sizer in the testPanel