diff --git a/src/test/check_getdns_common.c b/src/test/check_getdns_common.c
index d96748b0..f0c1ddc9 100644
--- a/src/test/check_getdns_common.c
+++ b/src/test/check_getdns_common.c
@@ -249,7 +249,7 @@ void assert_ptr_in_answer(struct extracted_response *ex_response)
  *  response that is returned.
  */
 void callbackfn(struct getdns_context *context,
-                uint16_t callback_type,
+                getdns_callback_type_t callback_type,
                 struct getdns_dict *response,
                 void *userarg,
                 getdns_transaction_t transaction_id)
@@ -293,7 +293,7 @@ void callbackfn(struct getdns_context *context,
  *  response that is returned.
  */
 void update_callbackfn(struct getdns_context *context,
-                uint16_t changed_item)
+                getdns_context_code_t changed_item)
 {
 
   ck_assert_msg(changed_item == expected_changed_item,
diff --git a/src/test/check_getdns_context_set_timeout.c b/src/test/check_getdns_context_set_timeout.c
index 01e15984..c1f7c37b 100644
--- a/src/test/check_getdns_context_set_timeout.c
+++ b/src/test/check_getdns_context_set_timeout.c
@@ -164,7 +164,7 @@ void* run_server(void* data) {
 }
 
 void timeout_3_cb(struct getdns_context *context,
-                  uint16_t callback_type,
+                  getdns_callback_type_t callback_type,
                   struct getdns_dict * response,
                   void *userarg, getdns_transaction_t transaction_id) {
     timeout_thread_data *tdata = (timeout_thread_data*)userarg;
diff --git a/src/test/check_getdns_service.h b/src/test/check_getdns_service.h
index f3e958fc..34cc370c 100644
--- a/src/test/check_getdns_service.h
+++ b/src/test/check_getdns_service.h
@@ -31,7 +31,7 @@
        *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL; 
-       struct event_base *event_base = NULL; 
+       void* eventloop = NULL; 
        getdns_transaction_t transaction_id = 0;
 
        CONTEXT_CREATE(TRUE);
@@ -53,7 +53,7 @@
        *  expect:  GETDNS_RETURN_BAD_DOMAIN_NAME
        */
        struct getdns_context *context = NULL; 
-       struct event_base *event_base = NULL;
+       void* eventloop = NULL;
        getdns_transaction_t transaction_id = 0;
        const char *name = "oh.my.gosh.and.for.petes.sake.are.you.fricking.crazy.man.because.this.spectacular.and.elaborately.thought.out.domain.name.of.very.significant.length.is.just.too.darn.long.because.you.know.the rfc.states.that.two.hundred.fifty.five.characters.is.the.max.com";
        
@@ -76,7 +76,7 @@
        *  expect:  GETDNS_RETURN_BAD_DOMAIN_NAME
        */
        struct getdns_context *context = NULL; 
-       struct event_base *event_base = NULL;
+       void* eventloop = NULL;
        getdns_transaction_t transaction_id = 0;
        const char *name = "this.domain.hasalabelwhichexceedsthemaximumdnslabelsizeofsixtythreecharacters.com";
        
@@ -99,7 +99,7 @@
        *  expect:  GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL; 
-       struct event_base *event_base = NULL;
+       void* eventloop = NULL;
        getdns_transaction_t transaction_id = 0;
        
        CONTEXT_CREATE(TRUE);
@@ -126,7 +126,7 @@
        */
        void verify_getdns_service_7(struct extracted_response *ex_response);
        struct getdns_context *context = NULL;   \
-       struct event_base *event_base = NULL;    \
+       void* eventloop = NULL;    \
        getdns_transaction_t transaction_id = 0;
      
        CONTEXT_CREATE(TRUE);
@@ -175,4 +175,4 @@
        return s;
      }
 
-#endif
\ No newline at end of file
+#endif