diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c
index 4b55524e63..9797de3f40 100644
--- a/snmplib/snmp_api.c
+++ b/snmplib/snmp_api.c
@@ -769,7 +769,7 @@ snmp_sess_init(netsnmp_session * session)
     session->retries = SNMP_DEFAULT_RETRIES;
     session->version = SNMP_DEFAULT_VERSION;
     session->securityModel = SNMP_DEFAULT_SECMODEL;
-    session->rcvMsgMaxSize = SNMP_MAX_MSG_SIZE;
+    session->rcvMsgMaxSize = netsnmp_max_send_msg_size();
     session->sndMsgMaxSize = netsnmp_max_send_msg_size();
     session->flags |= SNMP_FLAGS_DONT_PROBE;
 }
diff --git a/testing/fulltests/default/T0221snmpbulkget_large_simple b/testing/fulltests/default/T0221snmpbulkget_large_simple
index a33d124193..d3bff5d596 100755
--- a/testing/fulltests/default/T0221snmpbulkget_large_simple
+++ b/testing/fulltests/default/T0221snmpbulkget_large_simple
@@ -5,9 +5,6 @@
 HEADER large SNMPv3 bulkget
 
 SKIPIFNOT USING_MIBII_SYSTEM_MIB_MODULE
-# To do: figure out why this test fails as follows on BSD systems:
-# Timeout: No Response from udp:127.0.0.1:8767
-[ $(uname) = Linux ] || SKIP "Skipping this test on non-Linux systems"
 
 #
 # Begin test