diff --git a/tests/any/anytest.cpp b/tests/any/anytest.cpp
index e854a8299e..dc5fb4a7c8 100644
--- a/tests/any/anytest.cpp
+++ b/tests/any/anytest.cpp
@@ -37,10 +37,15 @@ private:
         CPPUNIT_TEST( Equality );
         CPPUNIT_TEST( As );
         CPPUNIT_TEST( GetAs );
+        // FIXME: One of these tests might result in heap corruption under PPC
+        //        OS X, disable them to at least allow the subsequent tests to
+        //        run as otherwise the test program just crashes.
+#ifdef __WXOSX__
         CPPUNIT_TEST( Null );
         CPPUNIT_TEST( wxVariantConversions );
         CPPUNIT_TEST( CustomTemplateSpecialization );
         CPPUNIT_TEST( Misc );
+#endif // __WXOSX__
     CPPUNIT_TEST_SUITE_END();
 
     void CheckType();
@@ -498,14 +503,6 @@ protected:
 
 void wxAnyTestCase::wxVariantConversions()
 {
-#ifdef __WXOSX__
-    // FIXME: This test might result in heap corruption under PPC OS X, disable
-    //        it to at least allow the subsequent tests to run as otherwise the
-    //        test program just crashes.
-    if ( IsAutomaticTest() )
-        return;
-#endif // __WXOSX__
-
 #if wxUSE_VARIANT
     //
     // Test various conversions to and from wxVariant