diff --git a/resources/hiding_ci/build_and_install_kernel.sh b/resources/hiding_ci/build_and_install_kernel.sh
index c898a581384..7d27f3a3f86 100755
--- a/resources/hiding_ci/build_and_install_kernel.sh
+++ b/resources/hiding_ci/build_and_install_kernel.sh
@@ -24,7 +24,7 @@ check_ubuntu() {
 tidy_up() {
   # Some cleanup after we are done
   echo "Cleaning up.."
-  popd
+  cd $START_DIR
   rm -rf $TMP_BUILD_DIR
 }
 
@@ -103,7 +103,8 @@ KERNEL_CONFIG_OVERRIDES=$(pwd)/kernel_config_overrides
 
 TMP_BUILD_DIR=$(mktemp -d -t kernel-build-XXXX)
 
-pushd .
+START_DIR=$(pwd)
+
 cd $TMP_BUILD_DIR
 
 echo "Cloning kernel repository into" $TMP_BUILD_DIR
diff --git a/tests/integration_tests/performance/test_snapshot_ab.py b/tests/integration_tests/performance/test_snapshot_ab.py
index b4f1b8f15dc..e8a24a43b50 100644
--- a/tests/integration_tests/performance/test_snapshot_ab.py
+++ b/tests/integration_tests/performance/test_snapshot_ab.py
@@ -12,6 +12,7 @@
 
 import host_tools.drive as drive_tools
 from framework.microvm import HugePagesConfig, Microvm
+from framework.properties import global_props
 
 USEC_IN_MSEC = 1000
 NS_IN_MSEC = 1_000_000
@@ -153,6 +154,15 @@ def test_post_restore_latency(
     if huge_pages != HugePagesConfig.NONE and uffd_handler is None:
         pytest.skip("huge page snapshots can only be restored using uffd")
 
+    if (
+        huge_pages != HugePagesConfig.NONE
+        and global_props.host_linux_version_tpl > (6, 1)
+        and global_props.cpu_architecture == "aarch64"
+    ):
+        pytest.skip(
+            "huge pages with secret hiding kernels on ARM are currently failing"
+        )
+
     test_setup = SnapshotRestoreTest(mem=1024, vcpus=2, huge_pages=huge_pages)
     vm = test_setup.boot_vm(microvm_factory, guest_kernel_linux_5_10, rootfs)