diff --git a/tests/ci/tools/ci.conf b/tests/ci/tools/ci.conf
--- a/tests/ci/tools/ci.conf
+++ b/tests/ci/tools/ci.conf
@@ -12,26 +12,30 @@
 
 if [ "${CITYPE}" != "smoke" ]; then
 export VM_EXTRA_PACKAGES="
+archivers/gtar
+devel/git
 devel/gdb
 devel/py-pytest
 perl5
 lang/python
 lang/python3
+net/isc-dhcp44-server
+net/ndisc6
 net/py-dpkt
 net/scapy
 net/tcptestsuite
 security/nist-kat
 security/nmap
+security/openvpn
 security/sudo
 shells/ksh93
 sysutils/coreutils
 sysutils/porch
+sysutils/sg3_utils
 textproc/jq
 "
-
-	if [ "${TARGET}" = "amd64" ]; then
-		export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} linux-c7-ltp"
-	fi
+# TODO waiting on packages to show up on 15-CURRENT
+#export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} filesystems/ext2"
 fi
 
 vm_extra_pre_umount() {
@@ -54,22 +58,36 @@
 test_suites.FreeBSD.disks = '/dev/vtbd2 /dev/vtbd3 /dev/vtbd4 /dev/vtbd5 /dev/vtbd6'
 EOF
 kld_list=""				# Load modules needed by tests
+kld_list="${kld_list} accf_data"	# sys/kern/socket_accf
+kld_list="${kld_list} accf_dns"		# sys/kern/socket_accf
+kld_list="${kld_list} accf_http"	# sys/kern/socket_accf
+kld_list="${kld_list} accf_tls"		# sys/kern/socket_accf
 kld_list="${kld_list} blake2"		# sys/opencrypto
 kld_list="${kld_list} carp"		# sys/netinet/carp
 kld_list="${kld_list} cryptodev"	# sys/opencrypto
 kld_list="${kld_list} dummymbuf"	# sys/netpfil
 kld_list="${kld_list} dummynet"		# sys/netpfil/common
 kld_list="${kld_list} fusefs"		# sys/fs/fusefs
+kld_list="${kld_list} if_bridge"	# sys/net/if_bridge_test
+kld_list="${kld_list} if_enc"		# sys/netpfil/pf
+kld_list="${kld_list} if_epair"		# sys/net/if_epair_test
+kld_list="${kld_list} if_ovpn"		# sys/net/if_ovpn
 kld_list="${kld_list} if_stf"		# sys/net/if_stf
 kld_list="${kld_list} ipdivert"		# sys/netinet (loads ipdivert)
 kld_list="${kld_list} ipfw"		# sys/netpfil/ipfw (loads ipfw)
 kld_list="${kld_list} ipfw_nat"		# sys/netpfil/ipfw (loads ipfw_nat)
 kld_list="${kld_list} ipl"		# sys/sbin/ipf (loads ipfilter)
 kld_list="${kld_list} ipsec"		# sys/netipsec
+kld_list="${kld_list} mac_ipacl"	# sys/mac/ipacl
 kld_list="${kld_list} mac_portacl"	# sys/mac/portacl
 kld_list="${kld_list} mqueuefs"		# sys/kern/mqueue_test
+kld_list="${kld_list} pf"		# sys/netpfil/pf
 kld_list="${kld_list} pflog"		# sys/netpfil/pf
+kld_list="${kld_list} pflow"		# sys/netpfil/pf
 kld_list="${kld_list} pfsync"		# sys/netpfil/pf (loads pf)
+kld_list="${kld_list} sctp"		# sys/netpfil/pf
+kld_list="${kld_list} tarfs"		# sys/fs/tarfs
+kld_list="${kld_list} tcpmd5"		# sys/netinet
 sysrc -f ${DESTDIR}/etc/rc.conf \
 	kld_list="${kld_list}" \
 	background_fsck="NO" \
@@ -79,6 +97,7 @@
 	newsyslog_enable="NO" \
 	freebsdci_type="${CITYPE}" \
 	freebsdci_test_filters="${KYUA_TEST_FILTERS}"
+
 cat << EOF >> ${DESTDIR}/etc/sysctl.conf
 kern.cryptodevallowsoft=1
 kern.ipc.tls.enable=1