diff --git a/tests/tstunits/Makefile b/tests/tstunits/Makefile
index c23d1937ff..f4ba6c5063 100644
--- a/tests/tstunits/Makefile
+++ b/tests/tstunits/Makefile
@@ -1755,16 +1755,16 @@ endif
 .PHONY: cleanrtl distcleanrtl
 .PHONY: cleanfpcunit distcleanfpcunit
 .PHONY: cleanpackages distcleanpackages
-ifeq ($(OS_TARGET),msdos)
-override OPT=-CX
-endif
-TESTOPT:=-n $(TEST_OPT) -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
+TESTOPT:=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
 ifeq ($(CPU_TARGET),armeb)
 override TESTOPT+=-Cb
 endif
 ifneq ($(BINUTILSPREFIX),)
 override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc
 endif
+ifeq ($(OS_TARGET),msdos)
+override TESTOPT+=-CX
+endif
 TESTCOMPILER:=$(FPC) $(TESTOPT)
 ifdef CROSSCOMPILE
 override CROSSOPT:=$(OPT)
diff --git a/tests/tstunits/Makefile.fpc b/tests/tstunits/Makefile.fpc
index a18de5e092..d37418f006 100644
--- a/tests/tstunits/Makefile.fpc
+++ b/tests/tstunits/Makefile.fpc
@@ -23,17 +23,17 @@ fpcdir=../..
 .PHONY: cleanfpcunit distcleanfpcunit
 .PHONY: cleanpackages distcleanpackages
 
-ifeq ($(OS_TARGET),msdos)
-override OPT=-CX
-endif
 
-TESTOPT:=-n $(TEST_OPT) -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
+TESTOPT:=-n -FE$(COMPILER_TARGETDIR) -T$(OS_TARGET) $(OPT)
 ifeq ($(CPU_TARGET),armeb)
 override TESTOPT+=-Cb
 endif
 ifneq ($(BINUTILSPREFIX),)
 override TESTOPT+=-XP$(BINUTILSPREFIX) -Xc
 endif
+ifeq ($(OS_TARGET),msdos)
+override TESTOPT+=-CX
+endif
 TESTCOMPILER:=$(FPC) $(TESTOPT)
 
 ifdef CROSSCOMPILE