diff --git a/test/align13.asm b/test/align13.asm
index 556373fc..4a41a779 100644
--- a/test/align13.asm
+++ b/test/align13.asm
@@ -1,3 +1,6 @@
+;Testname=unoptimized; Arguments=-O0 -fbin -oalign13.bin; Files=stdout stderr align13.bin
+;Testname=optimized; Arguments=-Ox -fbin -oalign13.bin; Files=stdout stderr align13.bin
+
 ; Test of non-power-of-2 alignment
 
 	bits 32
diff --git a/test/align13s.asm b/test/align13s.asm
index dab21a20..7f783175 100644
--- a/test/align13s.asm
+++ b/test/align13s.asm
@@ -1,4 +1,8 @@
+;Testname=unoptimized; Arguments=-O0 -fbin -oalign13s.bin; Files=stdout stderr align13s.bin
+;Testname=optimized; Arguments=-Ox -fbin -oalign13s.bin; Files=stdout stderr align13s.bin
+
 ; Test of non-power-of-2 alignment
+
 %use smartalign
 
 	bits 32
diff --git a/test/alonesym-obj.asm b/test/alonesym-obj.asm
index 6be4d5db..8db3a2c4 100644
--- a/test/alonesym-obj.asm
+++ b/test/alonesym-obj.asm
@@ -1,3 +1,6 @@
+;Testname=unoptimized; Arguments=-O0 -fobj -oalonesym-obj.obj; Files=stdout stderr alonesym-obj.obj
+;Testname=optimized; Arguments=-Ox -fobj -oalonesym-obj.obj; Files=stdout stderr alonesym-obj.obj
+
 section         DOS32DATA align=16 public use32 FLAT class=DOS32DATA
 
                 global sym0000
diff --git a/test/bcd.asm b/test/bcd.asm
index bb45ca64..b58d81aa 100644
--- a/test/bcd.asm
+++ b/test/bcd.asm
@@ -1,3 +1,5 @@
+;Testname=optimized; Arguments=-Ox -fbin -obcd.bin; Files=stdout stderr bcd.bin
+
 	dt 765432109876543210p
 	dt -765432109876543210p
 	dt +765432109876543210p
diff --git a/test/br2003451.asm b/test/br2003451.asm
index fb309a99..74e32345 100644
--- a/test/br2003451.asm
+++ b/test/br2003451.asm
@@ -1,3 +1,5 @@
+;Testname=optimized; Arguments=-Ox -fbin -obr2003451.bin; Files=stdout stderr br2003451.bin
+
 	cpu 8086
 	org 0
 
diff --git a/test/br2030823.asm b/test/br2030823.asm
index ce7ba43d..fd8f5eba 100644
--- a/test/br2030823.asm
+++ b/test/br2030823.asm
@@ -1,4 +1,6 @@
-	bits 64
+;Testname=optimized; Arguments=-Ox -fbin -obr2030823.bin; Files=stdout stderr br2030823.bin
+
+bits 64
 	VFMADDPD xmm0, xmm1, [0], xmm3
 	VFMADDPD xmm0, xmm1, xmm2, [0]
 	VFMADDPD ymm0, ymm1, [0], ymm3
diff --git a/test/br3005117.asm b/test/br3005117.asm
index 4e7a5b5b..66a46f8f 100644
--- a/test/br3005117.asm
+++ b/test/br3005117.asm
@@ -1,3 +1,5 @@
+;Testname=br3005117; Arguments=-Ox -felf -obr3005117.o; Files=stdout stderr br3005117.o
+
 %macro B_STRUC 1-*
 %push foo
 %define %$strucname %1
diff --git a/test/br3026808.asm b/test/br3026808.asm
index 5c61c953..d84923a1 100644
--- a/test/br3026808.asm
+++ b/test/br3026808.asm
@@ -1,3 +1,5 @@
+;Testname=br3026808; Arguments=-Ox -fbin -obr3026808.o; Files=stdout stderr br3026808.o
+
 %imacro proc 1
 	%push proc
 	%assign %$arg 1
diff --git a/test/br3028880.asm b/test/br3028880.asm
index 20c8bd09..b6b2cf2b 100644
--- a/test/br3028880.asm
+++ b/test/br3028880.asm
@@ -1,3 +1,5 @@
+;Testname=br3028880; Arguments=-Ox -fbin -obr3028880.o; Files=stdout stderr br3028880.o
+
 %macro import 1
 	%define %%incfile %!PROJECTBASEDIR/%{1}.inc
 %endmacro
diff --git a/test/br3066383.asm b/test/br3066383.asm
index 09222ac7..d6a8646b 100644
--- a/test/br3066383.asm
+++ b/test/br3066383.asm
@@ -1,3 +1,5 @@
+;Testname=br3066383; Arguments=-Ox -fbin -obr3066383.bin; Files=stdout stderr br3066383.bin
+
 ;
 ; this is a for BR3005117
 ; http://sourceforge.net/tracker/?func=detail&aid=3005117&group_id=6208&atid=106208