diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 60d665bee46030ca4a4dd95fe8995e99a091c3f5..7fb957c2841ea5de4074950155715ac5bd269905 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -35,9 +35,16 @@ endif()
 ########################################
 # setup NASM
 ########################################
-enable_language(ASM_NASM)
-if(NOT CMAKE_ASM_NASM_COMPILER_LOADED)
-  message(FATAL_ERROR "Can't find assembler")
+if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
+  enable_language(ASM)
+  if(NOT CMAKE_ASM_COMPILER_LOADED)
+    message(FATAL_ERROR "Can't find assembler")
+  endif()
+else()
+  enable_language(ASM_NASM)
+  if(NOT CMAKE_ASM_NASM_COMPILER_LOADED)
+    message(FATAL_ERROR "Can't find assembler")
+  endif()
 endif()
 
 set(NASM_VERSION_REQUIRED "2.14")
diff --git a/test/kat-app/CMakeLists.txt b/test/kat-app/CMakeLists.txt
index 2f64b0f205773f736e076b1dceaa65a649fd4a2c..9b6766bc836e486e19adadd8fed13a53104d1e39 100644
--- a/test/kat-app/CMakeLists.txt
+++ b/test/kat-app/CMakeLists.txt
@@ -42,7 +42,12 @@ if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "aarch64")
   set(TEST_APP_SRC_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/main.c
     ${CMAKE_CURRENT_SOURCE_DIR}/api_test.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_test.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eea3_128.json.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eea3_256.json.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eia3_128.json.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eia3_256.json.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eea3_test.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/zuc_eia3_test.c
     ${CMAKE_CURRENT_SOURCE_DIR}/snow3g_test.c
     ${CMAKE_CURRENT_SOURCE_DIR}/snow3g_test_f8_vectors.json.c
     ${CMAKE_CURRENT_SOURCE_DIR}/snow3g_test_f9_vectors.json.c