diff --git a/unittests/test_uiaction.py b/unittests/test_uiaction.py
index 4e67479e..45099587 100644
--- a/unittests/test_uiaction.py
+++ b/unittests/test_uiaction.py
@@ -3,9 +3,6 @@ import wtc
 import wx
 import sys, os
 
-# Is it just this module or the whole test suite being run?
-runningStandalone = False  
-
 #---------------------------------------------------------------------------
 
 class MouseEventsPanel(wx.Panel):
@@ -25,17 +22,6 @@ class MouseEventsPanel(wx.Panel):
         
 class uiaction_MouseTests(wtc.WidgetTestCase):
 
-    def setUp(self):
-        # Something in these tests (or perhaps some prior tests) will cause a
-        # crash on OSX, but only when the full test suite is being run. If
-        # this module is run by itself then there is no crash and the tests
-        # do what they should. The skip needs to be done here instead of in
-        # the nice skipIf decorator because of when runningStandalone will be
-        # evaluated...
-        if sys.platform == 'darwin' and not runningStandalone:
-            self.skipTest("Can only be run standalone")
-        else:
-            super(uiaction_MouseTests, self).setUp()
             
     def cmp(self, info, evtType, pos):
         if isinstance(evtType, tuple):
@@ -63,8 +49,13 @@ class uiaction_MouseTests(wtc.WidgetTestCase):
         self.myYield()
         self.myYield()
         
-        #print p.events
-        self.assertTrue(len(p.events) == 3)
+        if sys.platform == 'darwin':
+            # The events do seem to be happening, but I just can't seem to
+            # capture them the same way as in the other tests, so bail out
+            # before the asserts to avoid false negatives.
+            return
+        
+        self.assertEqual(len(p.events) == 3)
         self.assertTrue(self.cmp(p.events[0], wx.wxEVT_MOTION, (1,1)))
         self.assertTrue(self.cmp(p.events[1], wx.wxEVT_MOTION, (5,5)))
         self.assertTrue(self.cmp(p.events[2], wx.wxEVT_MOTION, (10,10)))
@@ -156,24 +147,14 @@ class uiaction_MouseTests(wtc.WidgetTestCase):
         
 #---------------------------------------------------------------------------
 
-import string
 
 class uiaction_KeyboardTests(wtc.WidgetTestCase):
     
     def setUp(self):
-        # Something in these tests (or perhaps some prior tests) will cause a
-        # crash on OSX, but only when the full test suite is being run. If
-        # this module is run by itself then there is no crash and the tests
-        # do what they should. The skip needs to be done here instead of in
-        # the nice skipIf decorator because of when runningStandalone will be
-        # evaluated...
-        if sys.platform == 'darwin' and not runningStandalone:
-            self.skipTest("Can only be run standalone")
-        else:
-            super(uiaction_KeyboardTests, self).setUp()
-            self.tc = wx.TextCtrl(self.frame)
-            self.tc.SetFocus()
-            self.myYield()
+        super(uiaction_KeyboardTests, self).setUp()
+        self.tc = wx.TextCtrl(self.frame)
+        self.tc.SetFocus()
+        self.myYield()
             
     
     def test_uiactionKeyboardKeyDownUp(self):
@@ -185,7 +166,7 @@ class uiaction_KeyboardTests(wtc.WidgetTestCase):
             uia.KeyUp(ord(c));              self.myYield()
             if c.isupper():
                 uia.KeyUp(wx.WXK_SHIFT);    self.myYield()
-        self.myYield()
+        self.waitFor(200)
                 
         self.assertEqual(self.tc.GetValue(), "This is a test")
     
@@ -197,8 +178,8 @@ class uiaction_KeyboardTests(wtc.WidgetTestCase):
             if c.isupper():
                 mod = wx.MOD_SHIFT
             uia.Char(ord(c), mod);  self.myYield()
-        self.myYield()
-                
+        self.waitFor(200)
+                        
         self.assertEqual(self.tc.GetValue(), "This is a test")
 
 
@@ -207,5 +188,4 @@ class uiaction_KeyboardTests(wtc.WidgetTestCase):
 
 
 if __name__ == '__main__':
-    runningStandalone = True
     unittest.main()