diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a11905eba62..2556eb47f28 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 29 21:19:53 2001  Nicola Pero  <n.pero@mi.flashnet.it>
+
+	* objc/execute/class_self-1.m: New test.
+	* objc/execute/class_self-2.m: New test.
+
 2001-10-25  Zack Weinberg  <zack@codesourcery.com>
 
 	* gcc.misc-tests/msgs.exp: Delete.
diff --git a/gcc/testsuite/objc/execute/class_self-1.m b/gcc/testsuite/objc/execute/class_self-1.m
new file mode 100644
index 00000000000..4d4251628ea
--- /dev/null
+++ b/gcc/testsuite/objc/execute/class_self-1.m
@@ -0,0 +1,62 @@
+/* Contributed by Nicola Pero - Fri Oct 26 22:39:32 BST 2001 */
+#include <objc/objc.h>
+
+/* Test calling a class method when there is an instance method 
+   with conflicting types */
+
+/* This class should be unused but on broken compilers its instance
+   method might get picked up and used instead of the class method of
+   another class ! */
+struct d
+{
+  int a;
+};
+
+@interface UnusedClass
+{
+  Class isa;
+}
+- (struct d) method;
+@end
+
+@implementation UnusedClass
+- (struct d) method
+{
+  struct d u;
+  u.a = 0;
+  
+  return u;
+}
+@end
+
+/* The real class */
+@interface TestClass
+{
+  Class isa;
+}
++ (void) test;
++ (int) method;
+@end
+
+@implementation TestClass
++ (void) test
+{
+  if ([self method] != 4)
+    {
+      abort ();
+    }
+}
+
++ (int) method
+{
+  return 4;
+}
+@end
+
+
+int main (void)
+{
+  [TestClass test];
+
+  return 0;
+}
diff --git a/gcc/testsuite/objc/execute/class_self-2.m b/gcc/testsuite/objc/execute/class_self-2.m
new file mode 100644
index 00000000000..e64fcf9fff4
--- /dev/null
+++ b/gcc/testsuite/objc/execute/class_self-2.m
@@ -0,0 +1,65 @@
+/* Contributed by Nicola Pero - Fri Oct 26 22:39:32 BST 2001 */
+#include <objc/objc.h>
+
+/* Test calling a class method on self where self has been redefined
+   to be another class - the call requires a cast */
+
+
+/* The first class */
+struct d
+{
+  int a;
+};
+
+@interface ClassA
+{
+  Class isa;
+}
++ (Class) class;
++ (struct d) method;
+@end
+
+@implementation ClassA
++ (Class) class
+{
+  return self;
+}
+
++ (struct d) method
+{
+  struct d u;
+  u.a = 5;
+  
+  return u;
+}
+@end
+
+/* The second class */
+@interface TestClass
+{
+  Class isa;
+}
++ (void) test;
+@end
+
+@implementation TestClass
++ (void) test
+{
+  self = [ClassA class];
+  
+
+  if ([(Class)self method].a != 5)
+    {
+      abort ();
+    }
+}
+
+@end
+
+
+int main (void)
+{
+  [TestClass test];
+
+  return 0;
+}