diff --git a/test/Makefile b/test/Makefile
index 6bfcf05..e90b0cd 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -13,25 +13,25 @@ INSTALL	= install
 all: $(TARGETS)
 
 i386.o_OBJS = i386.o
-i386.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a i386 -f flat
+i386.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a i386
 
 i386_real.o_OBJS = i386_real.o
 i386_real.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a i386_real -f flat
 
 i486.o_OBJS = i486.o
-i486.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a i486 -f flat
+i486.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a i486
 
 i586.o_OBJS = i586.o
-i586.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a i586 -f flat
+i586.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a i586
 
 i686.o_OBJS = i686.o
-i686.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a i686 -f flat
+i686.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a i686
 
 sparc.o_OBJS = sparc.o
-sparc.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a sparc -f flat
+sparc.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a sparc
 
 sparc64.o_OBJS = sparc64.o
-sparc64.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a sparc64 -f flat
+sparc64.o_ASFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(ASFLAGS) -a sparc64
 
 i386.o: i386.S ../src/asm
 	$(AS) $(i386.o_ASFLAGS) -o i386.o i386.S
diff --git a/test/project.conf b/test/project.conf
index a9e0091..8d55a6c 100644
--- a/test/project.conf
+++ b/test/project.conf
@@ -7,7 +7,7 @@ type=object
 sources=i386.S
 
 [i386.S]
-asflags=-a i386 -f flat
+asflags=-a i386
 depends=../src/asm
 
 [i386_real.o]
@@ -23,7 +23,7 @@ type=object
 sources=i486.S
 
 [i486.S]
-asflags=-a i486 -f flat
+asflags=-a i486
 depends=../src/asm
 
 [i586.o]
@@ -31,7 +31,7 @@ type=object
 sources=i586.S
 
 [i586.S]
-asflags=-a i586 -f flat
+asflags=-a i586
 depends=../src/asm
 
 [i686.o]
@@ -39,7 +39,7 @@ type=object
 sources=i686.S
 
 [i686.S]
-asflags=-a i686 -f flat
+asflags=-a i686
 depends=../src/asm
 
 [sparc.o]
@@ -47,7 +47,7 @@ type=object
 sources=sparc.S
 
 [sparc.S]
-asflags=-a sparc -f flat
+asflags=-a sparc
 depends=../src/asm
 
 [sparc64.o]
@@ -55,5 +55,5 @@ type=object
 sources=sparc64.S
 
 [sparc64.S]
-asflags=-a sparc64 -f flat
+asflags=-a sparc64
 depends=../src/asm