diff --git a/test/asm/listing/040-align.s b/test/asm/listing/040-align.s
new file mode 100644
index 000000000..0eeaab0c2
--- /dev/null
+++ b/test/asm/listing/040-align.s
@@ -0,0 +1,20 @@
+; 2022-06-20 Spiro Trikaliotis
+
+        .byte 0
+
+        .align 4
+        .byte 4
+	.word 12
+	.word 18
+
+        .align 1
+        .byte 1
+
+        .align 8
+        .byte 8
+
+        .align 8
+        .byte 8
+
+	.align 128
+	.byte 128
diff --git a/test/asm/listing/ref/040-align.bin-ref b/test/asm/listing/ref/040-align.bin-ref
new file mode 100644
index 000000000..59fe4c266
Binary files /dev/null and b/test/asm/listing/ref/040-align.bin-ref differ
diff --git a/test/asm/listing/ref/040-align.ld65err-ref b/test/asm/listing/ref/040-align.ld65err-ref
new file mode 100644
index 000000000..4fa8ee839
--- /dev/null
+++ b/test/asm/listing/ref/040-align.ld65err-ref
@@ -0,0 +1 @@
+ld65: Warning: /home/spiro/Work/tmp/cc65.spiro.testcases-ca65/cfg/none.cfg:18: Segment 'CODE' isn't aligned properly; the resulting executable might not be functional.
diff --git a/test/asm/listing/ref/040-align.list-ref b/test/asm/listing/ref/040-align.list-ref
new file mode 100644
index 000000000..c8771aa54
--- /dev/null
+++ b/test/asm/listing/ref/040-align.list-ref
@@ -0,0 +1,29 @@
+ca65 Vx.xx - Git XXXXXXXXX
+Main file   : 040-align.s
+Current file: 040-align.s
+
+000000r 1               ; 2022-06-20 Spiro Trikaliotis
+000000r 1               
+000000r 1  00                   .byte 0
+000001r 1               
+000001r 1  xx xx xx             .align 4
+000004r 1  04                   .byte 4
+000005r 1  0C 00        	.word 12
+000007r 1  12 00        	.word 18
+000009r 1               
+000009r 1                       .align 1
+000009r 1  01                   .byte 1
+00000Ar 1               
+00000Ar 1  xx xx xx xx          .align 8
+00000Er 1  xx xx        
+000010r 1  08                   .byte 8
+000011r 1               
+000011r 1  xx xx xx xx          .align 8
+000015r 1  xx xx xx     
+000018r 1  08                   .byte 8
+000019r 1               
+000019r 1  xx xx xx xx  	.align 128
+00001Dr 1  xx xx xx xx  
+000021r 1  xx xx xx xx  
+000080r 1  80           	.byte 128
+000080r 1