diff --git a/tests/thread/queue.cpp b/tests/thread/queue.cpp
index 42ceb319c5..9188265d13 100644
--- a/tests/thread/queue.cpp
+++ b/tests/thread/queue.cpp
@@ -195,20 +195,22 @@ void *QueueTestCase::MyThread::Entry()
                 if ( res == wxMSGQUEUE_MISC_ERROR )
                     return (wxThread::ExitCode)wxMSGQUEUE_MISC_ERROR;
 
-                CPPUNIT_ASSERT_EQUAL( wxMSGQUEUE_NO_ERROR, res );
+                // We can't use Catch asserts outside of the main thread
+                // currently, unfortunately.
+                wxASSERT( res == wxMSGQUEUE_NO_ERROR );
             }
             ++messagesReceived;
             continue;
         }
 
-        CPPUNIT_ASSERT_EQUAL ( result, wxMSGQUEUE_TIMEOUT );
+        wxASSERT( result == wxMSGQUEUE_TIMEOUT );
 
         break;
     }
 
     if ( messagesReceived != m_maxMsgCount )
     {
-        CPPUNIT_ASSERT_EQUAL( m_type, WaitWithTimeout );
+        wxASSERT( m_type == WaitWithTimeout );
 
         return (wxThread::ExitCode)wxMSGQUEUE_TIMEOUT;
     }
diff --git a/tests/thread/tls.cpp b/tests/thread/tls.cpp
index 029f4e6be8..ab92177f33 100644
--- a/tests/thread/tls.cpp
+++ b/tests/thread/tls.cpp
@@ -63,8 +63,10 @@ public:
         gs_threadData.name = "worker";
         gs_threadData.number = 2;
 
-        CPPUNIT_ASSERT_EQUAL( std::string("worker"), gs_threadData.name );
-        CPPUNIT_ASSERT_EQUAL( 2, gs_threadData.number );
+        // We can't use Catch asserts outside of the main thread,
+        // unfortunately.
+        wxASSERT( gs_threadData.name == std::string("worker") );
+        wxASSERT( gs_threadData.number == 2 );
 
         return NULL;
     }