diff --git a/tests/smoke/install/task.yaml b/tests/smoke/install/task.yaml
index 54840f03946..9f730ae094b 100644
--- a/tests/smoke/install/task.yaml
+++ b/tests/smoke/install/task.yaml
@@ -45,8 +45,14 @@ execute: |
 
     echo "Ensure different bases work"
     for base in core18 core20 core22; do
-        # no core20 or core22 snap for i386
-        if { [ "$base" = "core20" ] || [ "$base" = "core22" ]; } && [ "$(uname -m)" = i686 ]; then
+        # TODO remove this logic once core22 base snaps are uploaded in
+        # all the supported architectures
+        if [ "$base" = "core22" ] && not os.query is-pc-amd64; then
+            continue
+        fi
+
+        # no core20 snap for i386 architecture
+        if [ "$base" = "core20" ] && os.query is-pc-i386; then
             continue
         fi