diff --git a/cmake/cpu_features.cmake b/cmake/cpu_features.cmake
index 1e2bdf8122e..4d09329bf97 100644
--- a/cmake/cpu_features.cmake
+++ b/cmake/cpu_features.cmake
@@ -36,12 +36,17 @@ if (ARCH_AARCH64)
     # [1] https://en.wikipedia.org/wiki/AArch64
     option (TIFLASH_ENABLE_ASIMD_SUPPORT "Enable Advanced SIMD support." ON)
     option (TIFLASH_ENABLE_SVE_SUPPORT "Enable Scalable Vector Extension support." OFF)
-    option (NO_ARMV81_OR_HIGHER "Disable ARMv8.1 or higher on Aarch64 for maximum compatibility with older/embedded hardware." OFF)
+    # TODO: default ON, to be changed after CI is updated
+    option (NO_ARMV81_OR_HIGHER "Disable ARMv8.1 or higher on Aarch64 for maximum compatibility with older/embedded hardware." ON)
 
     if (NO_ARMV81_OR_HIGHER)
         # crc32 is optional in v8.0 and mandatory in v8.1. Enable it as __crc32()* is used in lot's of places and even very old ARM CPUs
         # support it.
         set (COMPILER_FLAGS "${COMPILER_FLAGS} -march=armv8+crc")
+        if (TIFLASH_ENABLE_ASIMD_SUPPORT)
+            set (COMPILER_FLAGS "${COMPILER_FLAGS}+simd")
+            add_definitions(-DTIFLASH_ENABLE_ASIMD_SUPPORT=1)
+        endif ()
     else ()
         # ARMv8.2 is quite ancient but the lowest common denominator supported by both Graviton 2 and 3 processors [1]. In particular, it
         # includes LSE (made mandatory with ARMv8.1) which provides nice speedups without having to fall back to compat flag
diff --git a/tests/fullstack-test2/ddl/alter_pk.test b/tests/fullstack-test2/ddl/alter_pk.test
index a2403013157..0fd62ea4f05 100644
--- a/tests/fullstack-test2/ddl/alter_pk.test
+++ b/tests/fullstack-test2/ddl/alter_pk.test
@@ -62,7 +62,7 @@ mysql> alter table test.t drop primary key;
 mysql> drop table if exists test.t_case;
 ## create table with `source` is nullable
 ## insert some data and left `source` to be empty
-mysql> create table test.t_case (`case_no` varchar(32) not null,`source` varchar(20) default null,`p` varchar(12) DEFAULT NULL,primary key (`case_no`));
+mysql> create table test.t_case (`case_no` varchar(32) not null,`source` varchar(20) default null,`p` varchar(12) DEFAULT NULL,primary key (`case_no`) NONCLUSTERED);
 mysql> insert into test.t_case(case_no) values ("1"), ("2"), ("3"), ("4");
 
 ## drop the primary key, fill the `source` to be non-empty
@@ -88,7 +88,7 @@ mysql> select case_no,p,source from test.t_case;
 # issue 5859, case 2
 mysql> drop table if exists test.t_case;
 ## create table with `case_no`
-mysql> create table test.t_case (`case_no` varchar(32) not null,`p` varchar(12) DEFAULT NULL,primary key (`case_no`));
+mysql> create table test.t_case (`case_no` varchar(32) not null,`p` varchar(12) DEFAULT NULL,primary key (`case_no`) NONCLUSTERED);
 mysql> insert into test.t_case(case_no) values ("1"), ("2"), ("3"), ("4");
 
 mysql> alter table test.t_case add column `source` varchar(20) not null;