2 files changed, 16 insertions, 3 deletions

diff --git a/tests/sys/opencrypto/cryptotest.py b/tests/sys/opencrypto/cryptotest.py
index ecf9552e1f325..2a0a7f5c3b842 100644
--- a/tests/sys/opencrypto/cryptotest.py
+++ b/tests/sys/opencrypto/cryptotest.py
@@ -50,9 +50,9 @@ def katg(base, glob):
         raise unittest.SkipTest("Missing %s test vectors" % (base))
     return iglob(os.path.join(katdir, base, glob))
 
-aesmodules = [ 'cryptosoft0', 'aesni0', 'ccr0', 'ccp0' ]
+aesmodules = [ 'cryptosoft0', 'aesni0', 'armv8crypto0', 'ccr0', 'ccp0' ]
 desmodules = [ 'cryptosoft0', ]
-shamodules = [ 'cryptosoft0', 'aesni0', 'ccr0', 'ccp0' ]
+shamodules = [ 'cryptosoft0', 'aesni0', 'armv8crypto0', 'ccr0', 'ccp0' ]
 
 def GenTestCase(cname):
     try:
@@ -500,6 +500,7 @@ def GenTestCase(cname):
 
 cryptosoft = GenTestCase('cryptosoft0')
 aesni = GenTestCase('aesni0')
+armv8crypto = GenTestCase('armv8crypto0')
 ccr = GenTestCase('ccr0')
 ccp = GenTestCase('ccp0')
 
diff --git a/tests/sys/opencrypto/runtests.sh b/tests/sys/opencrypto/runtests.sh
index 3f38a18d3d632..680173610a00c 100644
--- a/tests/sys/opencrypto/runtests.sh
+++ b/tests/sys/opencrypto/runtests.sh
@@ -60,7 +60,19 @@ cleanup_tests()
 }
 trap cleanup_tests EXIT INT TERM
 
-for required_module in nexus/aesni cryptodev; do
+cpu_type="$(uname -p)"
+cpu_module=
+
+case ${cpu_type} in
+aarch64)
+	cpu_module=nexus/armv8crypto
+	;;
+amd64|i386)
+	cpu_module=nexus/aesni
+	;;
+esac
+
+for required_module in $cpu_module cryptodev; do
 	if ! kldstat -q -m $required_module; then
 		module_to_load=${required_module#nexus/}
 		if ! kldload ${module_to_load}; then