@@ -134,23 +134,23 @@
 	[self setTests];
 	[self dateTests];
 	[self numberTests];
 	[self streamTests];
 	[self TCPSocketTests];
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 	[self threadTests];
 #endif
 	[self URLTests];
-#ifdef OF_THREADS
+#ifdef OF_HAVE_THREADS
 	[self HTTPClientTests];
 #endif
 	[self XMLParserTests];
 	[self XMLNodeTests];
 	[self XMLElementBuilderTests];
 	[self serializationTests];
 	[self JSONTests];
-#ifdef OF_PLUGINS
+#ifdef OF_HAVE_PLUGINS
 	[self pluginTests];
 #endif
 	[self forwardingTests];
 #ifdef OF_HAVE_PROPERTIES
 	[self propertiesTests];