diff --git a/src/panfrost/compiler/bifrost/valhall/test/test-lower-constants.cpp b/src/panfrost/compiler/bifrost/valhall/test/test-lower-constants.cpp
index 7ec4f330a3d..f363ab3b1b2 100644
--- a/src/panfrost/compiler/bifrost/valhall/test/test-lower-constants.cpp
+++ b/src/panfrost/compiler/bifrost/valhall/test/test-lower-constants.cpp
@@ -12,6 +12,7 @@
 static inline void
 add_imm(bi_context *ctx)
 {
+   ctx->arch = 10;
    struct hash_table_u64 *stats = _mesa_hash_table_u64_create(ctx);
    bi_foreach_instr_global(ctx, I) {
       va_lower_constants(ctx, I, stats, UINT32_MAX);
diff --git a/src/panfrost/compiler/bifrost/valhall/test/test-mark-last.cpp b/src/panfrost/compiler/bifrost/valhall/test/test-mark-last.cpp
index f091255bdd5..5035feda5b6 100644
--- a/src/panfrost/compiler/bifrost/valhall/test/test-mark-last.cpp
+++ b/src/panfrost/compiler/bifrost/valhall/test/test-mark-last.cpp
@@ -26,7 +26,9 @@ strip_discard(bi_context *ctx)
    do {                                                                        \
       void *mem_ctx = ralloc_context(NULL);                                    \
       bi_builder *A = bit_builder(mem_ctx);                                    \
+      A->shader->arch = 10;                                                    \
       bi_builder *B = bit_builder(mem_ctx);                                    \
+      B->shader->arch = 10;                                                    \
       {                                                                        \
          UNUSED bi_builder *b = A;                                             \
          test;                                                                 \