Index: tests/OFInvocationTests.m
==================================================================
--- tests/OFInvocationTests.m
+++ tests/OFInvocationTests.m
@@ -103,15 +103,15 @@
 	    d12 + d13 + d14 + d15 + d16) / 16;
 }
 
 #ifdef __SIZEOF_INT128__
 __extension__
-- (__int128)invocationTestMethod5: (__int128)i1
+- (__int128)invocationTestMethod5: (int)i1
 				 : (__int128)i2
-				 : (int)i3	 /* to check alignment */
+				 : (int)i3
 				 : (__int128)i4
-				 : (__int128)i5
+				 : (int)i5
 				 : (__int128)i6
 				 : (__int128)i7
 				 : (__int128)i8
 				 : (__int128)i9
 				 : (__int128)i10
@@ -122,15 +122,15 @@
 				 : (__int128)i15
 				 : (__int128)i16
 {
 	__int128 mask = (__int128)0xFFFFFFFFFFFFFFFF << 64;
 
-	OF_ENSURE(i1 == mask + 1);
+	OF_ENSURE(i1 == 1);
 	OF_ENSURE(i2 == mask + 2);
 	OF_ENSURE(i3 == 3);
 	OF_ENSURE(i4 == mask + 4);
-	OF_ENSURE(i5 == mask + 5);
+	OF_ENSURE(i5 == 5);
 	OF_ENSURE(i6 == mask + 6);
 	OF_ENSURE(i7 == mask + 7);
 	OF_ENSURE(i8 == mask + 8);
 	OF_ENSURE(i9 == mask + 9);
 	OF_ENSURE(i10 == mask + 10);
@@ -139,13 +139,13 @@
 	OF_ENSURE(i13 == mask + 13);
 	OF_ENSURE(i14 == mask + 14);
 	OF_ENSURE(i15 == mask + 15);
 	OF_ENSURE(i16 == mask + 16);
 
-	return (((int)i1 + (int)i2 + (int)i3 + (int)i4 + (int)i5 + (int)i6 +
-	    (int)i7 + (int)i8 + (int)i9 + (int)i10 + (int)i11 + (int)i12 +
-	    (int)i13 + (int)i14 + (int)i15 + (int)i16) / 16) + mask;
+	return ((i1 + (int)i2 + i3 + (int)i4 + i5 + (int)i6 + (int)i7 +
+	    (int)i8 + (int)i9 + (int)i10 + (int)i11 + (int)i12 + (int)i13 +
+	    (int)i14 + (int)i15 + (int)i16) / 16) + mask;
 }
 #endif
 
 - (void)invocationTests
 {
@@ -279,11 +279,11 @@
 	for (int i = 1; i <= 16; i++) {
 		__extension__ __int128 i128 = 0xFFFFFFFFFFFFFFFF;
 		i128 <<= 64;
 		i128 |= i;
 
-		if (i == 3)
+		if (i == 1 || i == 3 || i == 5)
 			[invocation setArgument: &i
 					atIndex: i + 1];
 		else
 			[invocation setArgument: &i128
 					atIndex: i + 1];