diff --git a/unittests/test_lib_colourdb.py b/unittests/test_lib_colourdb.py
index aafe5c90..3fc0c980 100644
--- a/unittests/test_lib_colourdb.py
+++ b/unittests/test_lib_colourdb.py
@@ -19,8 +19,8 @@ class lib_colourdb_Tests(wtc.WidgetTestCase):
         self.assertEqual(wx.TheColourDatabase.Find('ORANGERED1'),
                          wx.Colour(255, 69, 0, 255))
 
-        self.assertEqual(wx.TheColourDatabase.FindName(wx.Colour(255, 69, 0)),
-                         'ORANGE RED')
+        self.assertIn(wx.TheColourDatabase.FindName(wx.Colour(255, 69, 0)),
+                      ['ORANGE RED', 'ORANGERED'])
         
 #---------------------------------------------------------------------------
 
diff --git a/unittests/test_lib_expando.py b/unittests/test_lib_expando.py
index ac9f16dd..025aca95 100644
--- a/unittests/test_lib_expando.py
+++ b/unittests/test_lib_expando.py
@@ -16,7 +16,11 @@ class lib_expando_Tests(wtc.WidgetTestCase):
         bs2 = w.GetSize()
         
         self.assertEqual(w.GetValue(), "This is a test\nThis is a New Label")
-        self.assertEqual(w.GetNumberOfLines(), 3)
+        
+        # All we can test here is that we have more lines than we started
+        # with, since different platforms may wrap at different spots in the
+        # string.
+        self.assertTrue(w.GetNumberOfLines() > 2)
         self.assertTrue(bs2.height > bs1.height)
         
 #---------------------------------------------------------------------------