diff --git a/tests/expectations/va_list.c b/tests/expectations/va_list.c
index 1e0b4663..31f6e485 100644
--- a/tests/expectations/va_list.c
+++ b/tests/expectations/va_list.c
@@ -5,23 +5,19 @@
 
 typedef int32_t (*VaListFnPtr)(va_list);
 
-typedef int32_t (*VaListFnPtr2)(void);
+typedef int32_t (*VaListFnPtr2)(va_list);
 
 typedef struct {
   int32_t (*fn1)(va_list);
 } Interface_______i32_______va_list;
 
-typedef struct {
-  int32_t (*fn1)(void);
-} Interface_______i32;
-
 int32_t va_list_test(va_list ap);
 
 int32_t va_list_test2(va_list ap);
 
 void va_list_fn_ptrs(int32_t (*fn1)(va_list),
-                     int32_t (*fn2)(void),
+                     int32_t (*fn2)(va_list),
                      VaListFnPtr fn3,
                      VaListFnPtr2 fn4,
                      Interface_______i32_______va_list fn5,
-                     Interface_______i32 fn6);
+                     Interface_______i32_______va_list fn6);
diff --git a/tests/expectations/va_list.compat.c b/tests/expectations/va_list.compat.c
index 40109bb4..f55bb06d 100644
--- a/tests/expectations/va_list.compat.c
+++ b/tests/expectations/va_list.compat.c
@@ -5,16 +5,12 @@
 
 typedef int32_t (*VaListFnPtr)(va_list);
 
-typedef int32_t (*VaListFnPtr2)(void);
+typedef int32_t (*VaListFnPtr2)(va_list);
 
 typedef struct {
   int32_t (*fn1)(va_list);
 } Interface_______i32_______va_list;
 
-typedef struct {
-  int32_t (*fn1)(void);
-} Interface_______i32;
-
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -24,11 +20,11 @@ int32_t va_list_test(va_list ap);
 int32_t va_list_test2(va_list ap);
 
 void va_list_fn_ptrs(int32_t (*fn1)(va_list),
-                     int32_t (*fn2)(void),
+                     int32_t (*fn2)(va_list),
                      VaListFnPtr fn3,
                      VaListFnPtr2 fn4,
                      Interface_______i32_______va_list fn5,
-                     Interface_______i32 fn6);
+                     Interface_______i32_______va_list fn6);
 
 #ifdef __cplusplus
 }  // extern "C"
diff --git a/tests/expectations/va_list.cpp b/tests/expectations/va_list.cpp
index 8988f930..aadadeab 100644
--- a/tests/expectations/va_list.cpp
+++ b/tests/expectations/va_list.cpp
@@ -6,7 +6,7 @@
 
 using VaListFnPtr = int32_t(*)(va_list);
 
-using VaListFnPtr2 = int32_t(*)();
+using VaListFnPtr2 = int32_t(*)(va_list);
 
 template<typename T>
 struct Interface {
@@ -20,10 +20,10 @@ int32_t va_list_test(va_list ap);
 int32_t va_list_test2(va_list ap);
 
 void va_list_fn_ptrs(int32_t (*fn1)(va_list),
-                     int32_t (*fn2)(),
+                     int32_t (*fn2)(va_list),
                      VaListFnPtr fn3,
                      VaListFnPtr2 fn4,
                      Interface<int32_t(*)(va_list)> fn5,
-                     Interface<int32_t(*)()> fn6);
+                     Interface<int32_t(*)(va_list)> fn6);
 
 }  // extern "C"
diff --git a/tests/expectations/va_list.pyx b/tests/expectations/va_list.pyx
index 2b8edd48..0593a3a2 100644
--- a/tests/expectations/va_list.pyx
+++ b/tests/expectations/va_list.pyx
@@ -8,21 +8,18 @@ cdef extern from *:
 
   ctypedef int32_t (*VaListFnPtr)(va_list);
 
-  ctypedef int32_t (*VaListFnPtr2)();
+  ctypedef int32_t (*VaListFnPtr2)(va_list);
 
   ctypedef struct Interface_______i32_______va_list:
     int32_t (*fn1)(va_list);
 
-  ctypedef struct Interface_______i32:
-    int32_t (*fn1)();
-
   int32_t va_list_test(va_list ap);
 
   int32_t va_list_test2(va_list ap);
 
   void va_list_fn_ptrs(int32_t (*fn1)(va_list),
-                       int32_t (*fn2)(),
+                       int32_t (*fn2)(va_list),
                        VaListFnPtr fn3,
                        VaListFnPtr2 fn4,
                        Interface_______i32_______va_list fn5,
-                       Interface_______i32 fn6);
+                       Interface_______i32_______va_list fn6);
diff --git a/tests/expectations/va_list_both.c b/tests/expectations/va_list_both.c
index 8da67989..2f3ac810 100644
--- a/tests/expectations/va_list_both.c
+++ b/tests/expectations/va_list_both.c
@@ -5,23 +5,19 @@
 
 typedef int32_t (*VaListFnPtr)(va_list);
 
-typedef int32_t (*VaListFnPtr2)(void);
+typedef int32_t (*VaListFnPtr2)(va_list);
 
 typedef struct Interface_______i32_______va_list {
   int32_t (*fn1)(va_list);
 } Interface_______i32_______va_list;
 
-typedef struct Interface_______i32 {
-  int32_t (*fn1)(void);
-} Interface_______i32;
-
 int32_t va_list_test(va_list ap);
 
 int32_t va_list_test2(va_list ap);
 
 void va_list_fn_ptrs(int32_t (*fn1)(va_list),
-                     int32_t (*fn2)(void),
+                     int32_t (*fn2)(va_list),
                      VaListFnPtr fn3,
                      VaListFnPtr2 fn4,
                      struct Interface_______i32_______va_list fn5,
-                     struct Interface_______i32 fn6);
+                     struct Interface_______i32_______va_list fn6);
diff --git a/tests/expectations/va_list_both.compat.c b/tests/expectations/va_list_both.compat.c
index 29895ded..e8c52bc8 100644
--- a/tests/expectations/va_list_both.compat.c
+++ b/tests/expectations/va_list_both.compat.c
@@ -5,16 +5,12 @@
 
 typedef int32_t (*VaListFnPtr)(va_list);
 
-typedef int32_t (*VaListFnPtr2)(void);
+typedef int32_t (*VaListFnPtr2)(va_list);
 
 typedef struct Interface_______i32_______va_list {
   int32_t (*fn1)(va_list);
 } Interface_______i32_______va_list;
 
-typedef struct Interface_______i32 {
-  int32_t (*fn1)(void);
-} Interface_______i32;
-
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -24,11 +20,11 @@ int32_t va_list_test(va_list ap);
 int32_t va_list_test2(va_list ap);
 
 void va_list_fn_ptrs(int32_t (*fn1)(va_list),
-                     int32_t (*fn2)(void),
+                     int32_t (*fn2)(va_list),
                      VaListFnPtr fn3,
                      VaListFnPtr2 fn4,
                      struct Interface_______i32_______va_list fn5,
-                     struct Interface_______i32 fn6);
+                     struct Interface_______i32_______va_list fn6);
 
 #ifdef __cplusplus
 }  // extern "C"
diff --git a/tests/expectations/va_list_tag.c b/tests/expectations/va_list_tag.c
index 1dc28cbb..d4fdc28c 100644
--- a/tests/expectations/va_list_tag.c
+++ b/tests/expectations/va_list_tag.c
@@ -5,23 +5,19 @@
 
 typedef int32_t (*VaListFnPtr)(va_list);
 
-typedef int32_t (*VaListFnPtr2)(void);
+typedef int32_t (*VaListFnPtr2)(va_list);
 
 struct Interface_______i32_______va_list {
   int32_t (*fn1)(va_list);
 };
 
-struct Interface_______i32 {
-  int32_t (*fn1)(void);
-};
-
 int32_t va_list_test(va_list ap);
 
 int32_t va_list_test2(va_list ap);
 
 void va_list_fn_ptrs(int32_t (*fn1)(va_list),
-                     int32_t (*fn2)(void),
+                     int32_t (*fn2)(va_list),
                      VaListFnPtr fn3,
                      VaListFnPtr2 fn4,
                      struct Interface_______i32_______va_list fn5,
-                     struct Interface_______i32 fn6);
+                     struct Interface_______i32_______va_list fn6);
diff --git a/tests/expectations/va_list_tag.compat.c b/tests/expectations/va_list_tag.compat.c
index ba2da4fa..2eaac9c0 100644
--- a/tests/expectations/va_list_tag.compat.c
+++ b/tests/expectations/va_list_tag.compat.c
@@ -5,16 +5,12 @@
 
 typedef int32_t (*VaListFnPtr)(va_list);
 
-typedef int32_t (*VaListFnPtr2)(void);
+typedef int32_t (*VaListFnPtr2)(va_list);
 
 struct Interface_______i32_______va_list {
   int32_t (*fn1)(va_list);
 };
 
-struct Interface_______i32 {
-  int32_t (*fn1)(void);
-};
-
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -24,11 +20,11 @@ int32_t va_list_test(va_list ap);
 int32_t va_list_test2(va_list ap);
 
 void va_list_fn_ptrs(int32_t (*fn1)(va_list),
-                     int32_t (*fn2)(void),
+                     int32_t (*fn2)(va_list),
                      VaListFnPtr fn3,
                      VaListFnPtr2 fn4,
                      struct Interface_______i32_______va_list fn5,
-                     struct Interface_______i32 fn6);
+                     struct Interface_______i32_______va_list fn6);
 
 #ifdef __cplusplus
 }  // extern "C"
diff --git a/tests/expectations/va_list_tag.pyx b/tests/expectations/va_list_tag.pyx
index 5b7ccca4..da64bfe1 100644
--- a/tests/expectations/va_list_tag.pyx
+++ b/tests/expectations/va_list_tag.pyx
@@ -8,21 +8,18 @@ cdef extern from *:
 
   ctypedef int32_t (*VaListFnPtr)(va_list);
 
-  ctypedef int32_t (*VaListFnPtr2)();
+  ctypedef int32_t (*VaListFnPtr2)(va_list);
 
   cdef struct Interface_______i32_______va_list:
     int32_t (*fn1)(va_list);
 
-  cdef struct Interface_______i32:
-    int32_t (*fn1)();
-
   int32_t va_list_test(va_list ap);
 
   int32_t va_list_test2(va_list ap);
 
   void va_list_fn_ptrs(int32_t (*fn1)(va_list),
-                       int32_t (*fn2)(),
+                       int32_t (*fn2)(va_list),
                        VaListFnPtr fn3,
                        VaListFnPtr2 fn4,
                        Interface_______i32_______va_list fn5,
-                       Interface_______i32 fn6);
+                       Interface_______i32_______va_list fn6);