diff --git a/src/test/check_getdns_address.h b/src/test/check_getdns_address.h
index 25fac7a5..5a9e7735 100644
--- a/src/test/check_getdns_address.h
+++ b/src/test/check_getdns_address.h
@@ -13,14 +13,14 @@
      {
       /*
        *  context = NULL
-       *  expect: GETDNS_RETURN_BAD_CONTEXT
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL; 
        getdns_transaction_t transaction_id = 0;
 
        ASSERT_RC(getdns_address(context, "google.com", NULL, 
          NULL, &transaction_id, callbackfn), 
-         GETDNS_RETURN_BAD_CONTEXT, "Return code from getdns_address()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_address()");
      }
      END_TEST
      
diff --git a/src/test/check_getdns_address_sync.h b/src/test/check_getdns_address_sync.h
index f850b2b3..43dffaeb 100644
--- a/src/test/check_getdns_address_sync.h
+++ b/src/test/check_getdns_address_sync.h
@@ -13,13 +13,13 @@
      {
       /*
        *  context = NULL
-       *  expect: GETDNS_RETURN_BAD_CONTEXT
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;   
        struct getdns_dict *response = NULL;
 
        ASSERT_RC(getdns_address_sync(context, "google.com", NULL, &response), 
-         GETDNS_RETURN_BAD_CONTEXT, "Return code from getdns_address_sync()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_address_sync()");
      }
      END_TEST
      
diff --git a/src/test/check_getdns_cancel_callback.h b/src/test/check_getdns_cancel_callback.h
index 7ff5bc5f..37d5253c 100644
--- a/src/test/check_getdns_cancel_callback.h
+++ b/src/test/check_getdns_cancel_callback.h
@@ -13,12 +13,12 @@
     {
       /*
        *  context = NULL
-       *  expect: GETDNS_RETURN_BAD_CONTEXT
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        getdns_transaction_t transaction_id = 0;
 
        ASSERT_RC(getdns_cancel_callback(NULL, transaction_id),
-         GETDNS_RETURN_BAD_CONTEXT, "Return code from getdns_cancel_callback()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_cancel_callback()");
     }
     END_TEST
      
diff --git a/src/test/check_getdns_context_set_context_update_callback.h b/src/test/check_getdns_context_set_context_update_callback.h
index 03d0dc16..b3ef2647 100644
--- a/src/test/check_getdns_context_set_context_update_callback.h
+++ b/src/test/check_getdns_context_set_context_update_callback.h
@@ -19,7 +19,7 @@
       struct getdns_context *context = NULL;
 
       ASSERT_RC(getdns_context_set_context_update_callback(context, update_callbackfn),
-        GETDNS_RETURN_BAD_CONTEXT, "Return code from getdns_context_set_context_update_callback()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_context_set_context_update_callback()");
         
     }
     END_TEST
diff --git a/src/test/check_getdns_general.h b/src/test/check_getdns_general.h
index 37006b39..7f69967f 100644
--- a/src/test/check_getdns_general.h
+++ b/src/test/check_getdns_general.h
@@ -13,14 +13,14 @@
      {
       /*
        *  context = NULL
-       *  expect: GETDNS_RETURN_BAD_CONTEXT
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL; 
        getdns_transaction_t transaction_id = 0;
 
        ASSERT_RC(getdns_general(context, "google.com", GETDNS_RRTYPE_A, NULL, 
          NULL, &transaction_id, callbackfn), 
-         GETDNS_RETURN_BAD_CONTEXT, "Return code from getdns_general()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_general()");
      }
      END_TEST
      
diff --git a/src/test/check_getdns_general_sync.h b/src/test/check_getdns_general_sync.h
index f6800628..5d64d1f7 100644
--- a/src/test/check_getdns_general_sync.h
+++ b/src/test/check_getdns_general_sync.h
@@ -13,13 +13,13 @@
      {
       /*
        *  context = NULL
-       *  expect: GETDNS_RETURN_BAD_CONTEXT
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;
        struct getdns_dict *response = NULL;
 
        ASSERT_RC(getdns_general_sync(context, "google.com", GETDNS_RRTYPE_A, NULL, &response), 
-         GETDNS_RETURN_BAD_CONTEXT, "Return code from getdns_general_sync()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_general_sync()");
      }
      END_TEST
      
diff --git a/src/test/check_getdns_hostname.h b/src/test/check_getdns_hostname.h
index 9c72cc67..f00e2b10 100644
--- a/src/test/check_getdns_hostname.h
+++ b/src/test/check_getdns_hostname.h
@@ -13,7 +13,7 @@
      {
       /*
        *  context = NULL
-       *  expect: GETDNS_RETURN_BAD_CONTEXT
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;
        struct getdns_dict *address = NULL;
@@ -29,7 +29,7 @@
 
        ASSERT_RC(getdns_hostname(context, address, NULL, 
          NULL, &transaction_id, callbackfn), 
-         GETDNS_RETURN_BAD_CONTEXT, "Return code from getdns_hostname()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_hostname()");
 
        DICT_DESTROY(address);
      }
diff --git a/src/test/check_getdns_hostname_sync.h b/src/test/check_getdns_hostname_sync.h
index ee014041..cedb9f28 100644
--- a/src/test/check_getdns_hostname_sync.h
+++ b/src/test/check_getdns_hostname_sync.h
@@ -13,7 +13,7 @@
      {
       /*
        *  context = NULL
-       *  expect: GETDNS_RETURN_BAD_CONTEXT
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;
        struct getdns_dict *address = NULL;
@@ -28,7 +28,7 @@
          GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_bindata()");
 
        ASSERT_RC(getdns_hostname_sync(context, address, NULL, &response), 
-         GETDNS_RETURN_BAD_CONTEXT, "Return code from getdns_hostname_sync()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_hostname_sync()");
 
        DICT_DESTROY(address);
      }