diff --git a/riscv-test-suite/env/test_macros.h b/riscv-test-suite/env/test_macros.h
index 1aee495a4..cc405e88f 100644
--- a/riscv-test-suite/env/test_macros.h
+++ b/riscv-test-suite/env/test_macros.h
@@ -438,14 +438,18 @@
     jalr x0,0(tempreg)			;\
 6:  LA(tempreg, 4f)			;\
     jalr x0,0(tempreg)			;\
-1:  .if (adj & 2 == 2) && (label == 1b)	;\
+1:  .if adj & 2 == 2			;\
+    .ifc label, 1b			;\
     .fill 2,1,0x00			;\
     .endif				;\
+    .endif				;\
     xori rd,rd, 0x1			;\
     beq x0,x0,6b			;\
-    .if (adj & 2 == 2) && (label == 1b)	;\
+    .if adj & 2 == 2			;\
+    .ifc label, 1b			;\
     .fill 2,1,0x00			;\
     .endif				;\
+    .endif				;\
     .if (imm/2) - 2 >= 0		;\
 	.set num,(imm/2)-2		;\
     .else				;\
@@ -476,9 +480,11 @@
     .rept num				;\
     nop					;\
     .endr				;\
-3:  .if (adj & 2 == 2) && (label == 3f)	;\
+3:  .if adj & 2 == 2			;\
+    .ifc label, 3f			;\
     .fill 2,1,0x00			;\
     .endif				;\
+    .endif				;\
     xori rd,rd, 0x3			;\
     LA(tempreg, 4f)			;\
     jalr x0,0(tempreg)			;\