Index: tests/OFMethodSignatureTests.m
==================================================================
--- tests/OFMethodSignatureTests.m
+++ tests/OFMethodSignatureTests.m
@@ -126,11 +126,12 @@
 
 	TEST(@"of_sizeof_type_encoding() #2",
 	    of_sizeof_type_encoding(@encode(struct test2_struct)) ==
 	    sizeof(struct test2_struct))
 
-#if !defined(__STDC_NO_COMPLEX__) && defined(HAVE_COMPLEX_H)
+#if !defined(__STDC_NO_COMPLEX__) && defined(HAVE_COMPLEX_H) && \
+    OF_GCC_VERSION >= 402
 	TEST(@"of_sizeof_type_encoding() #3",
 	    of_sizeof_type_encoding(@encode(struct test3_struct)) ==
 	    sizeof(struct test3_struct))
 #endif
 
@@ -152,11 +153,12 @@
 
 	TEST(@"of_alignof_type_encoding() #2",
 	    of_alignof_type_encoding(@encode(struct test2_struct)) ==
 	    OF_ALIGNOF(struct test2_struct))
 
-#if !defined(__STDC_NO_COMPLEX__) && defined(HAVE_COMPLEX_H)
+#if !defined(__STDC_NO_COMPLEX__) && defined(HAVE_COMPLEX_H) && \
+    OF_GCC_VERSION >= 402
 	TEST(@"of_alignof_type_encoding() #3",
 	    of_alignof_type_encoding(@encode(struct test3_struct)) ==
 	    OF_ALIGNOF(struct test3_struct))
 #endif
 

Index: tests/OFStreamTests.m
==================================================================
--- tests/OFStreamTests.m
+++ tests/OFStreamTests.m
@@ -74,11 +74,11 @@
 	cstr = [t allocMemoryWithSize: pageSize - 2];
 	memset(cstr, 'X', pageSize - 3);
 	cstr[pageSize - 3] = '\0';
 
 	TEST(@"-[readLine]", [[t readLine] isEqual: @"foo"] &&
-	    (str = [t readLine]).length == pageSize - 3 &&
+	    [(str = [t readLine]) length] == pageSize - 3 &&
 	    !strcmp(str.UTF8String, cstr))
 
 	objc_autoreleasePoolPop(pool);
 }
 @end