@@ -143,15 +143,53 @@
 	OF_ENSURE(creal(c16) == 16.0 && cimag(c16) == 8.0);
 
 	return (c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9 + c10 + c11 +
 	    c12 + c13 + c14 + c15 + c16) / 16;
 }
+
+- (complex long double)invocationTestMethod6: (complex double)c1
+					    : (complex float)c2
+					    : (complex long double)c3
+					    : (complex double)c4
+					    : (complex float)c5
+					    : (complex long double)c6
+					    : (complex double)c7
+					    : (complex float)c8
+					    : (complex long double)c9
+					    : (complex double)c10
+					    : (complex float)c11
+					    : (complex long double)c12
+					    : (complex double)c13
+					    : (complex float)c14
+					    : (complex long double)c15
+					    : (complex double)c16
+{
+	OF_ENSURE(creal(c1) == 1.0 && cimag(c1) == 0.5);
+	OF_ENSURE(creal(c2) == 2.0 && cimag(c2) == 1.0);
+	OF_ENSURE(creal(c3) == 3.0 && cimag(c3) == 1.5);
+	OF_ENSURE(creal(c4) == 4.0 && cimag(c4) == 2.0);
+	OF_ENSURE(creal(c5) == 5.0 && cimag(c5) == 2.5);
+	OF_ENSURE(creal(c6) == 6.0 && cimag(c6) == 3.0);
+	OF_ENSURE(creal(c7) == 7.0 && cimag(c7) == 3.5);
+	OF_ENSURE(creal(c8) == 8.0 && cimag(c8) == 4.0);
+	OF_ENSURE(creal(c9) == 9.0 && cimag(c9) == 4.5);
+	OF_ENSURE(creal(c10) == 10.0 && cimag(c10) == 5.0);
+	OF_ENSURE(creal(c11) == 11.0 && cimag(c11) == 5.5);
+	OF_ENSURE(creal(c12) == 12.0 && cimag(c12) == 6.0);
+	OF_ENSURE(creal(c13) == 13.0 && cimag(c13) == 6.5);
+	OF_ENSURE(creal(c14) == 14.0 && cimag(c14) == 7.0);
+	OF_ENSURE(creal(c15) == 15.0 && cimag(c15) == 7.5);
+	OF_ENSURE(creal(c16) == 16.0 && cimag(c16) == 8.0);
+
+	return (c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9 + c10 + c11 +
+	    c12 + c13 + c14 + c15 + c16) / 16;
+}
 #endif
 
 #ifdef __SIZEOF_INT128__
 __extension__
-- (__int128)invocationTestMethod6: (int)i1
+- (__int128)invocationTestMethod7: (int)i1
 				 : (__int128)i2
 				 : (__int128)i3
 				 : (__int128)i4
 				 : (int)i5
 				 : (__int128)i6
@@ -334,15 +372,55 @@
 
 	complex double complexDoubleResult;
 	TEST(@"-[invoke] #4", R([invocation invoke]) &&
 	    R([invocation getReturnValue: &complexDoubleResult]) &&
 	    complexDoubleResult == 8.5 + 4.25 * I)
+
+	/* Only when encoding complex long doubles is supported */
+	if (strcmp(@encode(complex double),
+	    @encode(complex long double)) != 0) {
+		/* -[invoke] #5 */
+		selector = @selector(invocationTestMethod6::::::::::::::::);
+		invocation = [OFInvocation invocationWithMethodSignature:
+		    [self methodSignatureForSelector: selector]];
+
+		[invocation setArgument: &self
+				atIndex: 0];
+		[invocation setArgument: &selector
+				atIndex: 1];
+
+		for (int i = 1; i <= 16; i++) {
+			complex double cd = i + 0.5 * i * I;
+			complex float cf = i + 0.5 * i * I;
+			complex long double cld = i + 0.5 * i * I;
+
+			switch (i % 3) {
+			case 0:
+				[invocation setArgument: &cld
+						atIndex: i + 1];
+				break;
+			case 1:
+				[invocation setArgument: &cd
+						atIndex: i + 1];
+				break;
+			case 2:
+				[invocation setArgument: &cf
+						atIndex: i + 1];
+				break;
+			}
+		}
+
+		complex long double complexLongDoubleResult;
+		TEST(@"-[invoke] #5", R([invocation invoke]) &&
+		    R([invocation getReturnValue: &complexLongDoubleResult]) &&
+		    complexLongDoubleResult == 8.5 + 4.25 * I)
+	}
 # endif
 
 # ifdef __SIZEOF_INT128__
-	/* -[invoke] #5 */
-	selector = @selector(invocationTestMethod6::::::::::::::::);
+	/* -[invoke] #6 */
+	selector = @selector(invocationTestMethod7::::::::::::::::);
 	invocation = [OFInvocation invocationWithMethodSignature:
 	    [self methodSignatureForSelector: selector]];
 
 	[invocation setArgument: &self
 			atIndex: 0];
@@ -361,15 +439,15 @@
 			[invocation setArgument: &i128
 					atIndex: i + 1];
 	}
 
 	__extension__ __int128 int128Result;
-	TEST(@"-[invoke] #5", R([invocation invoke]) &&
+	TEST(@"-[invoke] #6", R([invocation invoke]) &&
 	    R([invocation getReturnValue: &int128Result]) &&
 	    int128Result == __extension__ ((__int128)0xFFFFFFFFFFFFFFFF << 64) +
 	    8)
 # endif
 #endif
 
 	[pool drain];
 }
 @end