3 files changed, 24 insertions, 7 deletions
diff --git a/tests/simple/const_branch_finish.v b/tests/simple/const_branch_finish.v
index 8166688e6..f585be87a 100644
--- a/tests/simple/const_branch_finish.v
+++ b/tests/simple/const_branch_finish.v
@@ -21,9 +21,6 @@ module top;
 		end
 	end
 	generate
-		begin : unconditional_block
-			initial `CONSTANT_CHECK
-		end
 		if (WIDTH == 32) begin : conditional_block
 			initial `CONSTANT_CHECK
 		end
diff --git a/tests/simple/generate.v b/tests/simple/generate.v
index ac4dd81a8..445c88ba8 100644
--- a/tests/simple/generate.v
+++ b/tests/simple/generate.v
@@ -167,7 +167,7 @@ module gen_test7;
 	reg [2:0] out2;
 	wire [2:0] out3;
 	generate
-		begin : cond
+		if (1) begin : cond
 			reg [2:0] sub_out1;
 			reg [2:0] sub_out2;
 			wire [2:0] sub_out3;
@@ -215,9 +215,9 @@ module gen_test8;
 
 	wire [1:0] x = 2'b11;
 	generate
-		begin : A
+		if (1) begin : A
 			wire [1:0] x;
-			begin : B
+			if (1) begin : B
 				wire [1:0] x = 2'b00;
 				`ASSERT(x == 0)
 				`ASSERT(A.x == 2)
@@ -228,7 +228,7 @@ module gen_test8;
 				`ASSERT(gen_test8.A.C.x == 1)
 				`ASSERT(gen_test8.A.B.x == 0)
 			end
-			begin : C
+			if (1) begin : C
 				wire [1:0] x = 2'b01;
 				`ASSERT(x == 1)
 				`ASSERT(A.x == 2)
diff --git a/tests/simple/macro_arg_surrounding_spaces.v b/tests/simple/macro_arg_surrounding_spaces.v
new file mode 100644
index 000000000..3dbb5ea01
--- /dev/null
+++ b/tests/simple/macro_arg_surrounding_spaces.v
@@ -0,0 +1,20 @@
+module top(
+	IDENT_V_,
+	IDENT_W_,
+	IDENT_X_,
+	IDENT_Y_,
+	IDENT_Z_,
+	IDENT_A_,
+	IDENT_B_,
+	IDENT_C_
+);
+	`define MACRO(dummy, x) IDENT_``x``_
+	output wire IDENT_V_;
+	output wire `MACRO(_,W);
+	output wire `MACRO(_, X);
+	output wire `MACRO(_,Y );
+	output wire `MACRO(_, Z );
+	output wire `MACRO(_,	 A);
+	output wire `MACRO(_,B	 );
+	output wire `MACRO(_, C	);
+endmodule