diff --git a/tests/test/tlea1.pp b/tests/test/tlea1.pp
index 375bd423a5..fb6a121055 100644
--- a/tests/test/tlea1.pp
+++ b/tests/test/tlea1.pp
@@ -3,6 +3,7 @@
 program tlea1;
 
 {$ASMMODE intel}
+{$define 16BITADDRSUPPORT}
 
 procedure Fail;
 begin
diff --git a/tests/test/tlea2.pp b/tests/test/tlea2.pp
index 8ee011e6c4..b071736e5f 100644
--- a/tests/test/tlea2.pp
+++ b/tests/test/tlea2.pp
@@ -3,6 +3,7 @@
 program tlea2;
 
 {$ASMMODE intel}
+{$define 32BITADDRSUPPORT}
 
 procedure Fail;
 begin
@@ -58,9 +59,64 @@ begin
     Fail;
 end;
 
+{$ifdef 32BITADDRSUPPORT}
+procedure TestO64A32;
+var
+  res: QWord;
+begin
+  Writeln('Testing LEA with 64-bit operand size and 32-bit address size...');
+  asm
+    mov rcx, 0deadbeefdeadbeefh
+    mov rdi, 0abcdefedcbabcdefh
+    mov rbx, 05566778899aabbcch
+    lea rbx, [ecx + edi * 8 + 12345678h]
+    mov res, rbx
+  end ['RBX', 'RCX', 'RDI'];
+  if res <> $4E4084DF then
+    Fail;
+end;
+
+procedure TestO32A32;
+var
+  res: QWord;
+begin
+  Writeln('Testing LEA with 32-bit operand size and 32-bit address size...');
+  asm
+    mov rcx, 0deadbeefdeadbeefh
+    mov rdi, 0abcdefedcbabcdefh
+    mov rbx, 05566778899aabbcch
+    lea ebx, [ecx + edi * 8 + 12345678h]
+    mov res, rbx
+  end ['RBX', 'RCX', 'RDI'];
+  if res <> $4E4084DF then
+    Fail;
+end;
+
+procedure TestO16A32;
+var
+  res: QWord;
+begin
+  Writeln('Testing LEA with 16-bit operand size and 32-bit address size...');
+  asm
+    mov rcx, 0deadbeefdeadbeefh
+    mov rdi, 0abcdefedcbabcdefh
+    mov rbx, 05566778899aabbcch
+    lea bx, [ecx + edi * 8 + 12345678h]
+    mov res, rbx
+  end ['RBX', 'RCX', 'RDI'];
+  if res <> $5566778899AA84DF then
+    Fail;
+end;
+{$endif 32BITADDRSUPPORT}
+
 begin
   TestO64A64;
   TestO32A64;
   TestO16A64;
+{$ifdef 32BITADDRSUPPORT}
+  TestO64A32;
+  TestO32A32;
+  TestO16A32;
+{$endif 32BITADDRSUPPORT}
   Writeln('Success!');
 end.