diff --git a/.pick_status.json b/.pick_status.json
index 82f1204b672..7703fe0308b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1390,7 +1390,7 @@
         "description": "ac/surface/tests: fix the ARM build",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8771d45a741da6c6b764826a95f99e453e7afeb9"
     },
diff --git a/src/amd/common/ac_surface_modifier_test.c b/src/amd/common/ac_surface_modifier_test.c
index 8c2f90fc8cc..91bdc8f5bba 100644
--- a/src/amd/common/ac_surface_modifier_test.c
+++ b/src/amd/common/ac_surface_modifier_test.c
@@ -42,10 +42,7 @@ struct test_entry {
    unsigned char hash[20];
 
    /* u_vector requires power of two sizing */
-   char padding[8];
-#ifdef PIPE_ARCH_X86
-   char padding2[8];
-#endif
+   char padding[sizeof(void*) == 8 ? 8 : 16];
 };
 
 static uint64_t