diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c
index dd09838b5d8..a23c245f7fe 100644
--- a/sbin/ifconfig/carp.c
+++ b/sbin/ifconfig/carp.c
@@ -246,10 +246,6 @@ static struct afswtch af_carp = {
 static __constructor void
 carp_ctor(void)
 {
-	/* Default to multicast. */
-	setcarp_mcast(NULL, NULL, 0);
-	setcarp_mcast6(NULL, NULL, 0);
-
 	for (size_t i = 0; i < nitems(carp_cmds);  i++)
 		cmd_register(&carp_cmds[i]);
 	af_register(&af_carp);
diff --git a/tests/sys/netinet/carp.sh b/tests/sys/netinet/carp.sh
index d0e10bc2c08..8cea2f4cbf1 100755
--- a/tests/sys/netinet/carp.sh
+++ b/tests/sys/netinet/carp.sh
@@ -155,8 +155,11 @@ unicast_v4_body()
 	atf_check -s exit:0 -o ignore jexec carp_uni_v4_one \
 	    ping -c 3 192.0.2.1
 
-	jexec carp_uni_v4_two ifconfig
-	jexec carp_uni_v4_three ifconfig
+	# Check that we remain in unicast when tweaking settings
+	atf_check -s exit:0 -o ignore \
+	    jexec carp_uni_v4_two ifconfig ${epair_one}b vhid 1 advskew 2
+	atf_check -s exit:0 -o match:"peer 198.51.100.130" \
+	    jexec carp_uni_v4_two ifconfig ${epair_one}b
 }
 
 unicast_v4_cleanup()