diff --git a/ChangeLog b/ChangeLog
index 4b7f20f34..df4c57cdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-25  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Tests/base/NSObject/test01.m: Only test for -isClass on GNUstep base.
+	* Tests/base/NSObject/initialize.m: Make test compile on MinGW.
+
 2011-08-22  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSObject.m (__builtin_offsetof): Add
diff --git a/Tests/base/NSObject/initialize.m b/Tests/base/NSObject/initialize.m
index 20136e6dd..3fbca458e 100644
--- a/Tests/base/NSObject/initialize.m
+++ b/Tests/base/NSObject/initialize.m
@@ -113,10 +113,12 @@ int main(void)
    */
   PASS(1, "initialize test starts");
 
+#if defined(SIGALRM)
   /* End in a signal if the concurrency test deadlocks.
    */
   signal(SIGALRM, alarmed);
   alarm(5);
+#endif
 
   l = [NSCondition new];
   [l lock];
diff --git a/Tests/base/NSObject/test01.m b/Tests/base/NSObject/test01.m
index 6fa0e9582..bb8946132 100644
--- a/Tests/base/NSObject/test01.m
+++ b/Tests/base/NSObject/test01.m
@@ -2,6 +2,13 @@
 #import <Foundation/NSAutoreleasePool.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSArray.h>
+
+#if defined(GNUSTEP_BASE_LIBRARY)
+@interface NSObject (ISCLASS)
+// This method doesn't exist on Cocoa
+- (BOOL) isClass;
+@end
+
 @interface MyEvilClass : NSObject
 {
  Class class;
@@ -23,11 +30,14 @@
   info = theInfo;
 }
 @end
+#endif
 
 int main()
 {
   NSAutoreleasePool   *arp = [NSAutoreleasePool new];
   id evilObject;
+
+#if defined(GNUSTEP_BASE_LIBRARY)
   PASS([NSObject isClass] &&
        [NSString isClass] &&
        [NSArray isClass],
@@ -42,6 +52,7 @@ int main()
   [evilObject setInfo:1];
   PASS(![evilObject isClass], 
        "-isClass returns NO on an instance (special test for broken libobjc)");
+#endif
   
   PASS(([[[NSObject new] autorelease] isKindOfClass:[NSObject class]] &&
        [[[NSString new] autorelease] isKindOfClass:[NSString class]] &&