diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
index 491955e0e2f2c..16e9787c115ad 100644
--- a/storage/columnstore/CMakeLists.txt
+++ b/storage/columnstore/CMakeLists.txt
@@ -78,6 +78,6 @@ CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
             SET(CPACK_RPM_columnstore-engine_PACKAGE_SUMMARY "MariaDB ColumnStore storage engine" PARENT_SCOPE)
             SET(CPACK_RPM_columnstore-engine_PACKAGE_DESCRIPTION "The MariaDB ColumnStore storage engine is a high-performance columnar analytical engine, aimed at rapid processing of analytical queries on very large amounts of data." PARENT_SCOPE)
         ENDIF()
-        INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/columnstore")
+        INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/columnstore/mysql-test/" "plugin/columnstore")
     ENDIF()
 ENDIF()
diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore
index e3a2563b58898..3024f8af6f545 160000
--- a/storage/columnstore/columnstore
+++ b/storage/columnstore/columnstore
@@ -1 +1 @@
-Subproject commit e3a2563b58898de8117199eddfd7845c5a24886d
+Subproject commit 3024f8af6f54535e7a4dfab6e34a241e1fa6f540