Index: head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh
===================================================================
--- head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh	(revision 326499)
+++ head/tests/sys/netipsec/tunnel/aes_cbc_128_hmac_sha1.sh	(revision 326500)
@@ -1,47 +1,49 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "v4" "cleanup"
 v4_head()
 {
 	atf_set descr 'IPSec inet4 tunnel using aes-cbc-128-hmac-sha1'
 	atf_set require.user root
-	# Unload AESNI module if loaded
-	kldstat -q -n aesni && kldunload aesni
 }
 
 v4_body()
 {
+	# Unload AESNI module if loaded
+	kldstat -q -n aesni && kldunload aesni
+
 	ist_test 4 rijndael-cbc "1234567890123456" hmac-sha1 "12345678901234567890"
 }
 
 v4_cleanup()
 {
 	ist_cleanup
 }
 
 atf_test_case "v6" "cleanup"
 v6_head()
 {
 	atf_set descr 'IPSec inet6 tunnel using aes-cbc-128-hmac-sha1'
 	atf_set require.user root
-	# Unload AESNI module if loaded
-	kldstat -q -n aesni && kldunload aesni
 }
 
 v6_body()
 {
+	# Unload AESNI module if loaded
+	kldstat -q -n aesni && kldunload aesni
+
 	ist_test 6 rijndael-cbc "1234567890123456" hmac-sha1 "12345678901234567890"
 }
 
 v6_cleanup()
 {
 	ist_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "v4"
 	atf_add_test_case "v6"
 }
Index: head/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh
===================================================================
--- head/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh	(revision 326499)
+++ head/tests/sys/netipsec/tunnel/aes_cbc_256_hmac_sha2_256.sh	(revision 326500)
@@ -1,47 +1,49 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "v4" "cleanup"
 v4_head()
 {
 	atf_set descr 'IPSec inet4 tunnel using aes-cbc-256-hmac-sha2-256'
 	atf_set require.user root
-	# load AESNI module if not already
-	kldstat -q -n aesni || kldload aesni
 }
 
 v4_body()
 {
+	# load AESNI module if not already
+	kldstat -q -n aesni || kldload aesni
+
 	ist_test 4 rijndael-cbc "12345678901234567890123456789012" hmac-sha2-256 "12345678901234567890123456789012"
 }
 
 v4_cleanup()
 {
 	ist_cleanup
 }
 
 atf_test_case "v6" "cleanup"
 v6_head()
 {
 	atf_set descr 'IPSec inet6 tunnel using aes-cbc-256-hmac-sha2-256'
 	atf_set require.user root
-	# load AESNI module if not already
-	kldstat -q -n aesni || kldload aesni
 }
 
 v6_body()
 {
+	# load AESNI module if not already
+	kldstat -q -n aesni || kldload aesni
+
 	ist_test 6 rijndael-cbc "12345678901234567890123456789012" hmac-sha2-256 "12345678901234567890123456789012"
 }
 
 v6_cleanup()
 {
 	ist_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "v4"
 	atf_add_test_case "v6"
 }
Index: head/tests/sys/netipsec/tunnel/aes_gcm_128.sh
===================================================================
--- head/tests/sys/netipsec/tunnel/aes_gcm_128.sh	(revision 326499)
+++ head/tests/sys/netipsec/tunnel/aes_gcm_128.sh	(revision 326500)
@@ -1,47 +1,49 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "v4" "cleanup"
 v4_head()
 {
 	atf_set descr 'IPSec inet4 tunnel using aes-gcm-128'
 	atf_set require.user root
-	# Unload AESNI module if loaded
-	kldstat -q -n aesni && kldunload aesni
 }
 
 v4_body()
 {
+	# Unload AESNI module if loaded
+	kldstat -q -n aesni && kldunload aesni
+
 	ist_test 4 aes-gcm-16 "12345678901234567890"
 }
 
 v4_cleanup()
 {
 	ist_cleanup
 }
 
 atf_test_case "v6" "cleanup"
 v6_head()
 {
 	atf_set descr 'IPSec inet6 tunnel using aes-gcm-128'
 	atf_set require.user root
-	# Unload AESNI module if loaded
-	kldstat -q -n aesni && kldunload aesni
 }
 
 v6_body()
 {
+	# Unload AESNI module if loaded
+	kldstat -q -n aesni && kldunload aesni
+
 	ist_test 6 aes-gcm-16 "12345678901234567890"
 }
 
 v6_cleanup()
 {
 	ist_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "v4"
 	atf_add_test_case "v6"
 }
Index: head/tests/sys/netipsec/tunnel/aes_gcm_256.sh
===================================================================
--- head/tests/sys/netipsec/tunnel/aes_gcm_256.sh	(revision 326499)
+++ head/tests/sys/netipsec/tunnel/aes_gcm_256.sh	(revision 326500)
@@ -1,47 +1,49 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "v4" "cleanup"
 v4_head()
 {
 	atf_set descr 'IPSec inet4 tunnel using aes-gcm-256'
 	atf_set require.user root
-	# Unload AESNI module if loaded
-	kldstat -q -n aesni && kldunload aesni
 }
 
 v4_body()
 {
+	# Unload AESNI module if loaded
+	kldstat -q -n aesni && kldunload aesni
+
 	ist_test 4 aes-gcm-16 "123456789012345678901234567890123456"
 }
 
 v4_cleanup()
 {
 	ist_cleanup
 }
 
 atf_test_case "v6" "cleanup"
 v6_head()
 {
 	atf_set descr 'IPSec inet6 tunnel using aes-gcm-256'
 	atf_set require.user root
-	# Unload AESNI module if loaded
-	kldstat -q -n aesni && kldunload aesni
 }
 
 v6_body()
 {
+	# Unload AESNI module if loaded
+	kldstat -q -n aesni && kldunload aesni
+
 	ist_test 6 aes-gcm-16 "123456789012345678901234567890123456"
 }
 
 v6_cleanup()
 {
 	ist_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "v4"
 	atf_add_test_case "v6"
 }
Index: head/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh
===================================================================
--- head/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh	(revision 326499)
+++ head/tests/sys/netipsec/tunnel/aesni_aes_cbc_128_hmac_sha1.sh	(revision 326500)
@@ -1,47 +1,49 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "v4" "cleanup"
 v4_head()
 {
 	atf_set descr 'IPSec inet4 tunnel using aes-cbc-128-hmac-sha1 and AESNI'
 	atf_set require.user root
-	# load AESNI module if not already
-	kldstat -q -n aesni || kldload aesni
 }
 
 v4_body()
 {
+	# load AESNI module if not already
+	kldstat -q -n aesni || kldload aesni
+
 	ist_test 4 rijndael-cbc "1234567890123456" hmac-sha1 "12345678901234567890"
 }
 
 v4_cleanup()
 {
 	ist_cleanup
 }
 
 atf_test_case "v6" "cleanup"
 v6_head()
 {
 	atf_set descr 'IPSec inet6 tunnel using aes-cbc-128-hmac-sha1 and AESNI'
 	atf_set require.user root
-	# load AESNI module if not already
-	kldstat -q -n aesni || kldload aesni
 }
 
 v6_body()
 {
+	# load AESNI module if not already
+	kldstat -q -n aesni || kldload aesni
+
 	ist_test 6 rijndael-cbc "1234567890123456" hmac-sha1 "12345678901234567890"
 }
 
 v6_cleanup()
 {
 	ist_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "v4"
 	atf_add_test_case "v6"
 }
Index: head/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh
===================================================================
--- head/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh	(revision 326499)
+++ head/tests/sys/netipsec/tunnel/aesni_aes_cbc_256_hmac_sha2_256.sh	(revision 326500)
@@ -1,47 +1,49 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "v4" "cleanup"
 v4_head()
 {
 	atf_set descr 'IPSec inet4 tunnel using aes-cbc-256-hmac-sha2-256 and AESNI'
 	atf_set require.user root
-	# Unload AESNI module if loaded
-	kldstat -q -n aesni && kldunload aesni
 }
 
 v4_body()
 {
+	# Unload AESNI module if loaded
+	kldstat -q -n aesni && kldunload aesni
+
 	ist_test 4 rijndael-cbc "12345678901234567890123456789012" hmac-sha2-256 "12345678901234567890123456789012"
 }
 
 v4_cleanup()
 {
 	ist_cleanup
 }
 
 atf_test_case "v6" "cleanup"
 v6_head()
 {
 	atf_set descr 'IPSec inet6 tunnel using aes-cbc-256-hmac-sha2-256 and AESNI'
 	atf_set require.user root
-	# Unload AESNI module if loaded
-	kldstat -q -n aesni && kldunload aesni
 }
 
 v6_body()
 {
+	# Unload AESNI module if loaded
+	kldstat -q -n aesni && kldunload aesni
+
 	ist_test 6 rijndael-cbc "12345678901234567890123456789012" hmac-sha2-256 "12345678901234567890123456789012"
 }
 
 v6_cleanup()
 {
 	ist_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "v4"
 	atf_add_test_case "v6"
 }
Index: head/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh
===================================================================
--- head/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh	(revision 326499)
+++ head/tests/sys/netipsec/tunnel/aesni_aes_gcm_128.sh	(revision 326500)
@@ -1,48 +1,50 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "v4" "cleanup"
 v4_head()
 {
 	atf_set descr 'IPSec inet4 tunnel using aes-gcm-128 and AESNI'
 	atf_set require.user root
-	# load AESNI module if not already
-	kldstat -q -n aesni || kldload aesni
 }
 
 v4_body()
 {
+	# load AESNI module if not already
+	kldstat -q -n aesni || kldload aesni
+
 	ist_test 4 aes-gcm-16 "12345678901234567890"
 }
 
 v4_cleanup()
 {
 	ist_cleanup
 }
 
 atf_test_case "v6" "cleanup"
 v6_head()
 {
 	atf_set descr 'IPSec inet6 tunnel using aes-gcm-128 and AESNI'
 	atf_set require.user root
-	# load AESNI module if not already
-	kldstat -q -n aesni || kldload aesni
 }
 
 v6_body()
 {
+	# load AESNI module if not already
+	kldstat -q -n aesni || kldload aesni
+
 	atf_expect_fail "PR 201447"
 	ist_test 6 aes-gcm-16 "12345678901234567890"
 }
 
 v6_cleanup()
 {
 	ist_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "v4"
 	atf_add_test_case "v6"
 }
Index: head/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh
===================================================================
--- head/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh	(revision 326499)
+++ head/tests/sys/netipsec/tunnel/aesni_aes_gcm_256.sh	(revision 326500)
@@ -1,48 +1,50 @@
 # $FreeBSD$
 
 . $(atf_get_srcdir)/utils.subr
 
 atf_test_case "v4" "cleanup"
 v4_head()
 {
 	atf_set descr 'IPSec inet4 tunnel using aes-gcm-256 and AESNI'
 	atf_set require.user root
-	# load AESNI module if not already
-	kldstat -q -n aesni || kldload aesni
 }
 
 v4_body()
 {
+	# load AESNI module if not already
+	kldstat -q -n aesni || kldload aesni
+
 	ist_test 4 aes-gcm-16 "123456789012345678901234567890123456"
 }
 
 v4_cleanup()
 {
 	ist_cleanup
 }
 
 atf_test_case "v6" "cleanup"
 v6_head()
 {
 	atf_set descr 'IPSec inet6 tunnel using aes-gcm-256 and AESNI'
 	atf_set require.user root
-	# load AESNI module if not already
-	kldstat -q -n aesni || kldload aesni
 }
 
 v6_body()
 {
+	# load AESNI module if not already
+	kldstat -q -n aesni || kldload aesni
+
 	atf_expect_fail "PR 201447"
 	ist_test 6 aes-gcm-16 "123456789012345678901234567890123456"
 }
 
 v6_cleanup()
 {
 	ist_cleanup
 }
 
 atf_init_test_cases()
 {
 	atf_add_test_case "v4"
 	atf_add_test_case "v6"
 }