diff --git a/testsuite/libffi.call/cls_struct_va1.c b/testsuite/libffi.call/cls_struct_va1.c

index 175ed96..6d1fdae 100644

--- a/testsuite/libffi.call/cls_struct_va1.c

+++ b/testsuite/libffi.call/cls_struct_va1.c

@@ -35,7 +35,7 @@ test_fn (ffi_cif* cif __UNUSED__, void* resp,

   printf ("%d %d %d %d %d %d %d %d %d %d\n", n, s1.a, s1.b,

 	  l1.a, l1.b, l1.c, l1.d, l1.e,

 	  s2.a, s2.b);

-  * (int*) resp = 42;

+  * (ffi_arg*) resp = 42;

 }

 int

diff --git a/testsuite/libffi.call/cls_uint_va.c b/testsuite/libffi.call/cls_uint_va.c

index 150fddd..548d8c6 100644

--- a/testsuite/libffi.call/cls_uint_va.c

+++ b/testsuite/libffi.call/cls_uint_va.c

@@ -10,12 +10,13 @@

 typedef unsigned int T;

-static void cls_ret_T_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,

+static void cls_ret_T_fn(ffi_cif* cif __UNUSED__, void *resp, void** args,

 			 void* userdata __UNUSED__)

  {

-   *(T *)resp = *(T *)args[0];

+   *(ffi_arg*)resp = *(T *)args[0];

-   printf("%d: %d %d\n", *(T *)resp, *(T *)args[0], *(T *)args[1]);

+

+   printf("%d: %d %d\n", (int)*(ffi_arg *)resp, *(T *)args[0], *(T *)args[1]);

  }

 typedef T (*cls_ret_T)(T, ...);

diff --git a/testsuite/libffi.call/va_1.c b/testsuite/libffi.call/va_1.c

index cf4dd85..7f96809 100644

--- a/testsuite/libffi.call/va_1.c

+++ b/testsuite/libffi.call/va_1.c

@@ -94,7 +94,7 @@ main (void)

   struct large_tag l1;

   int n;

-  int res;

+  ffi_arg res;

   unsigned char uc;

   signed char sc;

diff --git a/testsuite/libffi.call/va_struct1.c b/testsuite/libffi.call/va_struct1.c

index 11d1f10..e645206 100644

--- a/testsuite/libffi.call/va_struct1.c

+++ b/testsuite/libffi.call/va_struct1.c

@@ -61,7 +61,7 @@ main (void)

   struct large_tag l1;

   int n;

-  int res;

+  ffi_arg res;

   s_type.size = 0;

   s_type.alignment = 0;