diff --git a/Testing/server.h b/Testing/server.h
index 3bb00753b..949722cf6 100644
--- a/Testing/server.h
+++ b/Testing/server.h
@@ -57,7 +57,7 @@ struct myarray {
 @end
 #endif
 
-@interface Server : Object <ServerProtocol,InvalidationListening>
+@interface Server : NSObject <ServerProtocol,InvalidationListening>
 {
   id theList;
 }
diff --git a/Testing/server.m b/Testing/server.m
index 7408def96..65b18f175 100644
--- a/Testing/server.m
+++ b/Testing/server.m
@@ -198,7 +198,7 @@
 int main()
 {
   id l = [[Server alloc] init];
-  id o = [[Object alloc] init];
+  id o = [[NSObject alloc] init];
   double d;
   Connection *c;
 
diff --git a/Testing/test06.m b/Testing/test06.m
index d90178b55..0c5ab05db 100644
--- a/Testing/test06.m
+++ b/Testing/test06.m
@@ -11,13 +11,13 @@ int main()
 
   for (i = 0; i < N; i++)
     {
-      [array addObject:[[Object alloc] init]];
+      [array addObject:[[[NSObject alloc] init] autorelease]];
     }
 
   [array makeObjectsPerform:@selector(name)];
 
   [[array objectAtIndex:0] hash];
-  [[array releaseObjects] release];
+  [array release];
   printf("no errors\n");
   exit(0);
 }
diff --git a/Testing/test13.m b/Testing/test13.m
index 3e931abd6..209a44c88 100644
--- a/Testing/test13.m
+++ b/Testing/test13.m
@@ -20,11 +20,11 @@ int main ()
 
 	a = [Array new];
 
-	[a prependObject: [Object new]];
-	[a prependObject: [Object new]];
-	[a prependObject: [Object new]];
+	[a prependObject: [NSObject new]];
+	[a prependObject: [NSObject new]];
+	[a prependObject: [NSObject new]];
 	printf("count: %d\n", [a count]);
-	[a insertObject: [Object new] atIndex: 2]; // ok!
+	[a insertObject: [NSObject new] atIndex: 2]; // ok!
 	printf("count: %d\n", [a count]);
 
 	c = [[CircularArray alloc] initWithType:@encode(int)];
@@ -34,11 +34,11 @@ int main ()
 	[c insertElement:0 atIndex:2]; // core dump!
 
 	q = [Queue new];
-	[q enqueueObject: [Object new]];
-	[q enqueueObject: [Object new]];
-	[q enqueueObject: [Object new]];
+	[q enqueueObject: [NSObject new]];
+	[q enqueueObject: [NSObject new]];
+	[q enqueueObject: [NSObject new]];
 	printf("count: %d\n", [q count]);
-	[q insertObject: [Object new] atIndex: 2]; // core dump!
+	[q insertObject: [NSObject new] atIndex: 2]; // core dump!
 	printf("count: %d\n", [q count]);
 	return 0;
 }