diff --git a/constants.py b/constants.py
index 6f08e72d..e6073378 100644
--- a/constants.py
+++ b/constants.py
@@ -293,12 +293,13 @@
         if arch not in ["s390x", "x86"]:
             BUILDERS_INSTALL.append(builder_name_autobake + "-install")
             BUILDERS_UPGRADE.append(builder_name_autobake + "-minor-upgrade-all")
-            BUILDERS_UPGRADE.append(
-                builder_name_autobake + "-minor-upgrade-columnstore"
-            )
             BUILDERS_UPGRADE.append(builder_name_autobake + "-major-upgrade")
             BUILDERS_UPGRADE.append(builder_name_autobake + "-distro-upgrade")
 
+        if arch in ["amd64", "aarch64"]:
+            BUILDERS_UPGRADE.append(
+                builder_name_autobake + "-minor-upgrade-columnstore"
+            )
 BUILDERS_GALERA = list(
     map(lambda x: "gal-" + "-".join(x.split("-")[:3]), BUILDERS_AUTOBAKE)
 )
diff --git a/scripts/deb-upgrade.sh b/scripts/deb-upgrade.sh
index 640b1cec..caa41708 100755
--- a/scripts/deb-upgrade.sh
+++ b/scripts/deb-upgrade.sh
@@ -54,23 +54,8 @@ get_packages_file_mirror() {
 case $test_mode in
   all)
     get_packages_file_mirror
-    if grep -qi columnstore Packages; then
-      bb_log_warn "due to MCOL-4120 (Columnstore leaves the server shut down)"
-      bb_log_warn "and other bugs Columnstore upgrade is tested separately"
-    fi
     package_list=$(grep "^Package:" Packages |
-      grep -vE 'galera|spider|columnstore' |
       awk '{print $2}' | sort -u | xargs)
-    if grep -qi spider Packages; then
-      bb_log_warn "due to MDEV-14622 Spider will be installed separately after the server"
-      spider_package_list=$(grep "^Package:" Packages |
-        grep 'spider' | awk '{print $2}' |
-        sort -u | xargs)
-    fi
-    if grep -si tokudb Packages; then
-      # For the sake of installing TokuDB, disable hugepages
-      sudo sh -c "echo never > /sys/kernel/mm/transparent_hugepage/enabled" || true
-    fi
     ;;
   deps)
     package_list="mariadb-server mariadb-client mariadb-common mariadb-test mysql-common libmysqlclient18"
@@ -79,11 +64,6 @@ case $test_mode in
     package_list=mariadb-server
     ;;
   columnstore)
-    get_packages_file_mirror
-    if ! grep columnstore Packages >/dev/null; then
-      bb_log_warn "Columnstore was not found in packages, the test will not be run"
-      exit
-    fi
     package_list="mariadb-server mariadb-plugin-columnstore"
     ;;
   *)
@@ -122,15 +102,6 @@ fi
 
 wait_for_mariadb_upgrade
 
-if [[ -n $spider_package_list ]]; then
-  if ! sudo sh -c "DEBIAN_FRONTEND=noninteractive MYSQLD_STARTUP_TIMEOUT=180 \
-    apt-get -o Dpkg::Options::=--force-confnew install --allow-unauthenticated -y $spider_package_list"; then
-    bb_log_err "Installation of Spider from the previous release failed, see the output above"
-    exit 1
-  fi
-  wait_for_mariadb_upgrade
-fi
-
 # To avoid confusing errors in further logic, do an explicit check
 # whether the service is up and running
 if [[ $systemdCapability == "yes" ]]; then
diff --git a/scripts/rpm-upgrade.sh b/scripts/rpm-upgrade.sh
index 8904ea6e..3c7138ba 100755
--- a/scripts/rpm-upgrade.sh
+++ b/scripts/rpm-upgrade.sh
@@ -41,9 +41,6 @@ case $test_mode in
     # retrieve full package list from repo
     package_list=$(rpm_repoquery) ||
       bb_log_err "unable to retrieve package list from repository"
-    package_list=$(echo "$package_list" | grep -viE 'galera|columnstore')
-    alternative_names_package_list=$package_list
-    bb_log_warn "Due to MCOL-4120 and other issues, Columnstore upgrade will be tested separately"
     ;;
   server)
     package_list="MariaDB-server MariaDB-client"