diff --git a/tests/Makefile b/tests/Makefile
index 4508d11c8e..a3c8cdcc56 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1175,6 +1175,22 @@ $(DOTEST) : utils/dotest.pp utils/redir.pp
 
 testcheck: units $(DOTEST)
 
+#
+# Dotest options
+#
+
+ifneq ($(FPC),ppc386)
+override DOTESTOPT+=-c$(FPC)
+endif
+
+ifdef GRAPH
+override DOTESTOPT+=-g
+endif
+
+ifdef INTERACTIVE
+override DOTESTOPT+=-i
+endif
+
 #
 # Test run targets
 #
@@ -1188,11 +1204,14 @@ tests : clean all_compilations
 cont_tests : all_compilations
 
 %.log : %.pp
-	$(DOTEST) $<
+	$(DOTEST) $(DOTESTOPT) $<
 
 %.elg : %.pp
-	$(DOTEST) -e $<
+	$(DOTEST) $(DOTESTOPT) -e $<
 
+#
+# Compile tests
+#
 alltbs : testcheck $(patsubst %.pp,%.log,$(wildcard tbs/*.pp))
 alltbf : testcheck $(patsubst %.pp,%.log,$(wildcard tbf/*.pp))
 
@@ -1204,6 +1223,25 @@ alltestopt : testcheck $(patsubst %.pp,%.log,$(wildcard testopt/*.pp))
 
 alltests: alltest alltbs alltbf allwebtbs allwebtbf
 
+#
+# Compile and Run tests
+#
+
+allexectbs : testcheck $(patsubst %.pp,%.elg,$(wildcard tbs/*.pp))
+allexectbf : testcheck $(patsubst %.pp,%.elg,$(wildcard tbf/*.pp))
+
+allexecwebtbs : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbs/*.pp))
+allexecwebtbf : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbf/*.pp))
+
+allexectest : testcheck $(patsubst %.pp,%.elg,$(wildcard test/*.pp))
+allexectestopt : testcheck $(patsubst %.pp,%.elg,$(wildcard testopt/*.pp))
+
+allexectests: allexectest allexectbs allexectbf allexecwebtbs allexecwebtbf
+
+#
+# Clean
+#
+
 clean:
 	-rm -f $(addsuffix /*$(PPUEXT),$(DIRS))
 	-rm -f $(addsuffix /*$(OEXT),$(DIRS))
@@ -1220,7 +1258,7 @@ endif
 	-rm -f $(LOG) $(LONGLOG) $(FAILLIST)
 	-rm -f ppas.sh ppas.bat gmon.out
 
-full : clean all_compilations allexec
+full : clean allexectests
 
 info :
 	@echo This Makefile allows to test the compiler
diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc
index ea6497ab8a..b62dbd0a34 100644
--- a/tests/Makefile.fpc
+++ b/tests/Makefile.fpc
@@ -40,14 +40,30 @@ endif
 
 units : units/$(FPCMADE)
 units/$(FPCMADE):
-	$(MAKE) -C units
+        $(MAKE) -C units
 
 DOTEST=dotest$(EXEEXT)
 $(DOTEST) : utils/dotest.pp utils/redir.pp
-	$(FPC) -Fu../units -FE. utils/dotest
+        $(FPC) -Fu../units -FE. utils/dotest
 
 testcheck: units $(DOTEST)
 
+#
+# Dotest options
+#
+
+ifneq ($(FPC),ppc386)
+override DOTESTOPT+=-c$(FPC)
+endif
+
+ifdef GRAPH
+override DOTESTOPT+=-g
+endif
+
+ifdef INTERACTIVE
+override DOTESTOPT+=-i
+endif
+
 #
 # Test run targets
 #
@@ -61,11 +77,14 @@ tests : clean all_compilations
 cont_tests : all_compilations
 
 %.log : %.pp
-	$(DOTEST) $<
+        $(DOTEST) $(DOTESTOPT) $<
 
 %.elg : %.pp
-	$(DOTEST) -e $<
+        $(DOTEST) $(DOTESTOPT) -e $<
 
+#
+# Compile tests
+#
 alltbs : testcheck $(patsubst %.pp,%.log,$(wildcard tbs/*.pp))
 alltbf : testcheck $(patsubst %.pp,%.log,$(wildcard tbf/*.pp))
 
@@ -77,32 +96,51 @@ alltestopt : testcheck $(patsubst %.pp,%.log,$(wildcard testopt/*.pp))
 
 alltests: alltest alltbs alltbf allwebtbs allwebtbf
 
-clean:
-	-rm -f $(addsuffix /*$(PPUEXT),$(DIRS))
-	-rm -f $(addsuffix /*$(OEXT),$(DIRS))
-	-rm -f $(addsuffix /*.rst,$(DIRS))
-	-rm -f $(addsuffix /*$(SHAREDLIBEXT),$(DIRS))
-	-rm -f $(addsuffix /*.log,$(DIRS))
-	-rm -f $(addsuffix /*.elg,$(DIRS))
-ifdef INUNIX
-	-rm -f $(wildcard $(patsubst %.pp,%$(EXEEXT),$(wildcard $(addsuffix /t*.pp,$(DIRS)))))
-else
-	-rm -f $(addsuffix /*$(EXEEXT),$(DIRS))
-endif
-	-rm -f *.tmp
-	-rm -f $(LOG) $(LONGLOG) $(FAILLIST)
-	-rm -f ppas.sh ppas.bat gmon.out
+#
+# Compile and Run tests
+#
 
-full : clean all_compilations allexec
+allexectbs : testcheck $(patsubst %.pp,%.elg,$(wildcard tbs/*.pp))
+allexectbf : testcheck $(patsubst %.pp,%.elg,$(wildcard tbf/*.pp))
+
+allexecwebtbs : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbs/*.pp))
+allexecwebtbf : testcheck $(patsubst %.pp,%.elg,$(wildcard webtbf/*.pp))
+
+allexectest : testcheck $(patsubst %.pp,%.elg,$(wildcard test/*.pp))
+allexectestopt : testcheck $(patsubst %.pp,%.elg,$(wildcard testopt/*.pp))
+
+allexectests: allexectest allexectbs allexectbf allexecwebtbs allexecwebtbf
+
+#
+# Clean
+#
+
+clean:
+        -rm -f $(addsuffix /*$(PPUEXT),$(DIRS))
+        -rm -f $(addsuffix /*$(OEXT),$(DIRS))
+        -rm -f $(addsuffix /*.rst,$(DIRS))
+        -rm -f $(addsuffix /*$(SHAREDLIBEXT),$(DIRS))
+        -rm -f $(addsuffix /*.log,$(DIRS))
+        -rm -f $(addsuffix /*.elg,$(DIRS))
+ifdef INUNIX
+        -rm -f $(wildcard $(patsubst %.pp,%$(EXEEXT),$(wildcard $(addsuffix /t*.pp,$(DIRS)))))
+else
+        -rm -f $(addsuffix /*$(EXEEXT),$(DIRS))
+endif
+        -rm -f *.tmp
+        -rm -f $(LOG) $(LONGLOG) $(FAILLIST)
+        -rm -f ppas.sh ppas.bat gmon.out
+
+full : clean allexectests
 
 info :
-	@echo This Makefile allows to test the compiler
-	@echo compilation of 'ts*.pp' should succeed
-	@echo compilation of 'tf*.pp' should fail
-	@echo compilation of 'test*.pp' should succeed
-	@echo 'to*.pp' files should also compile
-	@echo simply run \'make tests\' to test all compilation
-	@echo run \'make allexec\' to test also if the executables
-	@echo created behave like the should
-	@echo run \'make tesiexec\' to test executables
-	@echo that require interactive mode
\ No newline at end of file
+        @echo This Makefile allows to test the compiler
+        @echo compilation of 'ts*.pp' should succeed
+        @echo compilation of 'tf*.pp' should fail
+        @echo compilation of 'test*.pp' should succeed
+        @echo 'to*.pp' files should also compile
+        @echo simply run \'make tests\' to test all compilation
+        @echo run \'make allexec\' to test also if the executables
+        @echo created behave like the should
+        @echo run \'make tesiexec\' to test executables
+        @echo that require interactive mode
\ No newline at end of file
diff --git a/tests/tbf/tb0001.pp b/tests/tbf/tb0001.pp
index d5c9e6c010..2cabcfed42 100644
--- a/tests/tbf/tb0001.pp
+++ b/tests/tbf/tb0001.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0010.pp }
 {  tests string constants exceeding lines              OK 0.9.2 }
 
diff --git a/tests/tbf/tb0002.pp b/tests/tbf/tb0002.pp
index 734c7799de..5abd18f27b 100644
--- a/tests/tbf/tb0002.pp
+++ b/tests/tbf/tb0002.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0029.pp }
 {  tests typeof(object type)                         OK 0.99.1 (FK) }
 
diff --git a/tests/tbf/tb0003.pp b/tests/tbf/tb0003.pp
index 0bb5da6489..b4e42b5236 100644
--- a/tests/tbf/tb0003.pp
+++ b/tests/tbf/tb0003.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0036.pp }
 {  assigning a single character to array of char      ?OK 0.9.9 }
 
diff --git a/tests/tbf/tb0004.pp b/tests/tbf/tb0004.pp
index a73cf60a1b..dd6abf74cf 100644
--- a/tests/tbf/tb0004.pp
+++ b/tests/tbf/tb0004.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0049.pp }
 {  shows an error while defining subrange types         OK 0.99.7 (PFV) }
 
diff --git a/tests/tbf/tb0005.pp b/tests/tbf/tb0005.pp
index fd09dd3c26..ebf56b048a 100644
--- a/tests/tbf/tb0005.pp
+++ b/tests/tbf/tb0005.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0060.pp }
 {  shows missing type checking for case statements      OK 0.99.1 (CEC) }
 
diff --git a/tests/tbf/tb0006.pp b/tests/tbf/tb0006.pp
index bb4726e808..19dac77f83 100644
--- a/tests/tbf/tb0006.pp
+++ b/tests/tbf/tb0006.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0061.pp }
 {  shows wrong errors when compiling (NOT A bugs)        OK 0.99.1 }
 
diff --git a/tests/tbf/tb0007.pp b/tests/tbf/tb0007.pp
index f6e84cb7d8..5ff679fc94 100644
--- a/tests/tbf/tb0007.pp
+++ b/tests/tbf/tb0007.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0071.pp }
 {  shows that an unterminated constant string in a writeln() statement crashes the compiler. }
 
diff --git a/tests/tbf/tb0008.pp b/tests/tbf/tb0008.pp
index c86cedd388..76d2bf1620 100644
--- a/tests/tbf/tb0008.pp
+++ b/tests/tbf/tb0008.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0075.pp }
 {  shows invalid pchar output to console                 OK 0.99.1 }
 
diff --git a/tests/tbf/tb0009.pp b/tests/tbf/tb0009.pp
index b6ae708e3e..6c01a7605f 100644
--- a/tests/tbf/tb0009.pp
+++ b/tests/tbf/tb0009.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0085.pp }
 {  shows runerror 216                                    OK 0.99.1 (CEC) }
 
diff --git a/tests/tbf/tb0010.pp b/tests/tbf/tb0010.pp
index 2953edcc8c..565079d929 100644
--- a/tests/tbf/tb0010.pp
+++ b/tests/tbf/tb0010.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0086.pp }
 {  shows runerror 216                                    OK 0.99.1 (CEC) }
 
diff --git a/tests/tbf/tb0011.pp b/tests/tbf/tb0011.pp
index a5a6806651..84f7ef50aa 100644
--- a/tests/tbf/tb0011.pp
+++ b/tests/tbf/tb0011.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0087.pp }
 {  shows internal error 12 - no more SegFaults           OK 0.99.1 (FK) }
 
diff --git a/tests/tbf/tb0012.pp b/tests/tbf/tb0012.pp
index 673fa9d4a0..e3e14ad0e8 100644
--- a/tests/tbf/tb0012.pp
+++ b/tests/tbf/tb0012.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0088.pp }
 {  internal error 12 or Runerror 216                     OK 0.99.1 (FK) }
 
diff --git a/tests/tbf/tb0013.pp b/tests/tbf/tb0013.pp
index 549fc2a7a0..74957273a7 100644
--- a/tests/tbf/tb0013.pp
+++ b/tests/tbf/tb0013.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0089.pp }
 {  internal error 12 or Runerror 216                     OK 0.99.1 (FK) }
 
diff --git a/tests/tbf/tb0014.pp b/tests/tbf/tb0014.pp
index e6a475fe2b..2e663def30 100644
--- a/tests/tbf/tb0014.pp
+++ b/tests/tbf/tb0014.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0094.pp }
 { internal error when recordtype not found with case    OK 0.99.1 }
 
diff --git a/tests/tbf/tb0015.pp b/tests/tbf/tb0015.pp
index 2863e707d3..10d13567af 100644
--- a/tests/tbf/tb0015.pp
+++ b/tests/tbf/tb0015.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0097.pp }
 { two errors in bp7 but not in FPC                      OK 0.99.6 (FK) }
 
diff --git a/tests/tbf/tb0016.pp b/tests/tbf/tb0016.pp
index 14539a8f76..acded5f482 100644
--- a/tests/tbf/tb0016.pp
+++ b/tests/tbf/tb0016.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0100.pp }
 { a unit may only occure once in uses                   OK 0.99.6 (PM) }
 
diff --git a/tests/tbf/tb0017.pp b/tests/tbf/tb0017.pp
index ebe83fad03..7d6d595e76 100644
--- a/tests/tbf/tb0017.pp
+++ b/tests/tbf/tb0017.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0101.pp }
 { no type checking for routines in interfance and       OK 0.99.1 (CEC) }
 
diff --git a/tests/tbf/tb0018.pp b/tests/tbf/tb0018.pp
index 89061bc26d..522a4f87cb 100644
--- a/tests/tbf/tb0018.pp
+++ b/tests/tbf/tb0018.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0108.pp }
 { gives wrong error message                             OK 0.99.1 (PFV) }
 
diff --git a/tests/tbf/tb0019.pp b/tests/tbf/tb0019.pp
index 443b5f6cd3..086e4f7e53 100644
--- a/tests/tbf/tb0019.pp
+++ b/tests/tbf/tb0019.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0109.pp }
 { syntax error not detected when using a set as pointer OK 0.99.1 (FK) }
 
diff --git a/tests/tbf/tb0020.pp b/tests/tbf/tb0020.pp
index 691cf6340a..df64a1d37a 100644
--- a/tests/tbf/tb0020.pp
+++ b/tests/tbf/tb0020.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0110.pp }
 { SigSegv when using undeclared var in Case             OK 0.99.6 (PFV) }
 
diff --git a/tests/tbf/tb0021.pp b/tests/tbf/tb0021.pp
index de037c3ec8..3ac23d5f0a 100644
--- a/tests/tbf/tb0021.pp
+++ b/tests/tbf/tb0021.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0117.pp }
 { internalerror 17 (and why is there an automatic float OK 0.99.6 (FK) }
 
diff --git a/tests/tbf/tb0022.pp b/tests/tbf/tb0022.pp
index 406eb0ed9c..ba717519bf 100644
--- a/tests/tbf/tb0022.pp
+++ b/tests/tbf/tb0022.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0127.pp }
 { problem with cdecl in implementation part             OK 0.99.7 (PFV) }
 
diff --git a/tests/tbf/tb0023.pp b/tests/tbf/tb0023.pp
index bd7c1e0245..2969180fe4 100644
--- a/tests/tbf/tb0023.pp
+++ b/tests/tbf/tb0023.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0136.pp }
 { No types necessary in the procedure header            OK 0.99.6 (PFV) }
 
diff --git a/tests/tbf/tb0024.pp b/tests/tbf/tb0024.pp
index df3fcf7455..2ee5fa4c2e 100644
--- a/tests/tbf/tb0024.pp
+++ b/tests/tbf/tb0024.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0148.pp }
 { crash when setting function result of a declared but not yet implemented function in another function }
 
diff --git a/tests/tbf/tb0025.pp b/tests/tbf/tb0025.pp
index a1622ff383..84d05a6635 100644
--- a/tests/tbf/tb0025.pp
+++ b/tests/tbf/tb0025.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0151.pp }
 { crash when using undeclared variable in withstatement OK 0.99.7 (PFV) }
 
diff --git a/tests/tbf/tb0026.pp b/tests/tbf/tb0026.pp
index 19cecb26be..fdc32452d8 100644
--- a/tests/tbf/tb0026.pp
+++ b/tests/tbf/tb0026.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0153.pp }
 { Asm, indexing a local/para var should produce an error like tp7 OK 0.99.9 (PFV) }
 
diff --git a/tests/tbf/tb0027.pp b/tests/tbf/tb0027.pp
index a7eaa36a9a..a9753562fb 100644
--- a/tests/tbf/tb0027.pp
+++ b/tests/tbf/tb0027.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0155.pp }
 { Asm, Missing string return for asm functions }
 
diff --git a/tests/tbf/tb0028.pp b/tests/tbf/tb0028.pp
index 1dfb1df8de..0a46568e12 100644
--- a/tests/tbf/tb0028.pp
+++ b/tests/tbf/tb0028.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0157.pp }
 { Invalid compilation and also crashes                  OK 0.99.7 (PFV) }
 
diff --git a/tests/tbf/tb0029.pp b/tests/tbf/tb0029.pp
index 6308059ed2..6761596b04 100644
--- a/tests/tbf/tb0029.pp
+++ b/tests/tbf/tb0029.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0158.pp }
 { Invalid boolean typecast                              OK 0.99.7 (PFV) }
 
diff --git a/tests/tbf/tb0030.pp b/tests/tbf/tb0030.pp
index d2d574f01f..c328dccf37 100644
--- a/tests/tbf/tb0030.pp
+++ b/tests/tbf/tb0030.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0161.pp }
 { internal error when trying to create a set with another OK 0.99.9 (PFV) }
 
diff --git a/tests/tbf/tb0031.pp b/tests/tbf/tb0031.pp
index b22eaf187b..8576aee009 100644
--- a/tests/tbf/tb0031.pp
+++ b/tests/tbf/tb0031.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0164.pp }
 { crash when using undeclared array index in with statement OK 0.99.8 (PFV) }
 
diff --git a/tests/tbf/tb0032.pp b/tests/tbf/tb0032.pp
index 00057ff20f..1356a1bb0d 100644
--- a/tests/tbf/tb0032.pp
+++ b/tests/tbf/tb0032.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0166.pp }
 { forward type used in declaration crashes instead of error OK 0.99.9 (PFV) }
 
diff --git a/tests/tbf/tb0033.pp b/tests/tbf/tb0033.pp
index 1890752664..d28e231c36 100644
--- a/tests/tbf/tb0033.pp
+++ b/tests/tbf/tb0033.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0167.pp }
 { crash when declaring a procedure with same name as object OK 0.99.9 (PFV) }
 
diff --git a/tests/tbf/tb0034.pp b/tests/tbf/tb0034.pp
index bbf76fa78e..b234c046b5 100644
--- a/tests/tbf/tb0034.pp
+++ b/tests/tbf/tb0034.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0168.pp }
 { set:=set+element is allowed (should be: set:=set+[element]) OK 0.99.9 (PFV) }
 
diff --git a/tests/tbf/tb0035.pp b/tests/tbf/tb0035.pp
index 8b0ed1a6d9..de5c7f134f 100644
--- a/tests/tbf/tb0035.pp
+++ b/tests/tbf/tb0035.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0172.pp }
 { with with absolute seg:ofs should not be possible OK 0.99.9 (PM) }
 
diff --git a/tests/tbf/tb0036.pp b/tests/tbf/tb0036.pp
index c3b8eb8ba6..78c4d746c9 100644
--- a/tests/tbf/tb0036.pp
+++ b/tests/tbf/tb0036.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0173.pp }
 { secondbugs is parsed as asm, but should be normal pascalcode OK 0.99.9 (PFV) }
 
diff --git a/tests/tbf/tb0037.pp b/tests/tbf/tb0037.pp
index 21cea93367..c03f73d415 100644
--- a/tests/tbf/tb0037.pp
+++ b/tests/tbf/tb0037.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0175.pp }
 { Asm, mov word,%eax should not be allowed without casting emits a warning (or error with range checking enabled)  OK 0.99.11 (PM) }
 
diff --git a/tests/tbf/tb0038.pp b/tests/tbf/tb0038.pp
index 482c8fc9f2..af3661a185 100644
--- a/tests/tbf/tb0038.pp
+++ b/tests/tbf/tb0038.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0186.pp }
 { Erroneous array syntax is accepted.                   OK 0.99.9 (PFV) }
 
diff --git a/tests/tbf/tb0039.pp b/tests/tbf/tb0039.pp
index 2ffc8916f5..98190109a4 100644
--- a/tests/tbf/tb0039.pp
+++ b/tests/tbf/tb0039.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0196.pp }
 { "function a;" is accepted (should require result type) OK 0.99.1 (PM) }
 
diff --git a/tests/tbf/tb0040.pp b/tests/tbf/tb0040.pp
index 0ec1d3113a..d7c1f21425 100644
--- a/tests/tbf/tb0040.pp
+++ b/tests/tbf/tb0040.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0197.pp }
 { should produce an error: problem with c1:=c2<c3 where c? is OK 0.99.11 (PM) a comp type }
 
diff --git a/tests/tbf/tb0041.pp b/tests/tbf/tb0041.pp
index 3547b7a58f..4cfd109f7d 100644
--- a/tests/tbf/tb0041.pp
+++ b/tests/tbf/tb0041.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0205.pp }
 { and parsing bugs, generates wrong code (tp7 gives parser error) OK 0.99.11 (PM) }
 
diff --git a/tests/tbf/tb0042.pp b/tests/tbf/tb0042.pp
index 36bede5401..4198017bcc 100644
--- a/tests/tbf/tb0042.pp
+++ b/tests/tbf/tb0042.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0208.pp }
 { implicit conversion from boolean to longint should not be allowed }
 
diff --git a/tests/tbf/tb0043.pp b/tests/tbf/tb0043.pp
index 21ad42c10b..5023ab9594 100644
--- a/tests/tbf/tb0043.pp
+++ b/tests/tbf/tb0043.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0219.pp }
 { wrong error message                                  OK 0.99.11 (PFV) }
 
diff --git a/tests/tbf/tb0044.pp b/tests/tbf/tb0044.pp
index 45100ee35f..65e9ece5b2 100644
--- a/tests/tbf/tb0044.pp
+++ b/tests/tbf/tb0044.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0230.pp }
 { several strange happen on the ln function: ln(0): no FPE and writeln can't write non numeric values Gives out an exception on compiling because of zero div OK 0.99.11 (PM) }
 
diff --git a/tests/tbf/tb0045.pp b/tests/tbf/tb0045.pp
index 58e7a6fd17..a3e0e26b2a 100644
--- a/tests/tbf/tb0045.pp
+++ b/tests/tbf/tb0045.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0231.pp }
 { Problem with comments                                OK 0.99.11 (PFV) }
 
diff --git a/tests/tbf/tb0046.pp b/tests/tbf/tb0046.pp
index c71ff5ec16..3b3f0caf7e 100644
--- a/tests/tbf/tb0046.pp
+++ b/tests/tbf/tb0046.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0234.pp }
 { New with void pointer                                OK 0.99.11 (PM) }
 
diff --git a/tests/tbf/tb0047.pp b/tests/tbf/tb0047.pp
index 48cdfc96fc..308e9b868c 100644
--- a/tests/tbf/tb0047.pp
+++ b/tests/tbf/tb0047.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0242.pp }
 { Crash when passing a procedure to formal parameter   OK 0.99.11 (PM) }
 
diff --git a/tests/tbf/tb0048.pp b/tests/tbf/tb0048.pp
index 5dab8dc5dd..5de27b326c 100644
--- a/tests/tbf/tb0048.pp
+++ b/tests/tbf/tb0048.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0245.pp }
 { assigning pointers to address of consts is allowed (refused by BP !) OK 0.99.13 (PFV) }
 
diff --git a/tests/tbf/tb0049.pp b/tests/tbf/tb0049.pp
index d42ab9110d..dd21157148 100644
--- a/tests/tbf/tb0049.pp
+++ b/tests/tbf/tb0049.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0246.pp }
 { const para can be changed without error              OK 0.99.13 (PFV) }
 
diff --git a/tests/tbf/tb0050.pp b/tests/tbf/tb0050.pp
index c99d76a3a8..aadb9f20f9 100644
--- a/tests/tbf/tb0050.pp
+++ b/tests/tbf/tb0050.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0248.pp }
 { Asm, Wrong assembler code accepted by new assembler reader OK 0.99.11 (PFV) }
 
diff --git a/tests/tbf/tb0051.pp b/tests/tbf/tb0051.pp
index 18d49096f7..a056a67357 100644
--- a/tests/tbf/tb0051.pp
+++ b/tests/tbf/tb0051.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0265.pp }
 { nested proc with for-counter in other lex level      OK 0.99.13 (PFV) }
 
diff --git a/tests/tbf/tb0052.pp b/tests/tbf/tb0052.pp
index 3801816a73..4d23d5567a 100644
--- a/tests/tbf/tb0052.pp
+++ b/tests/tbf/tb0052.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0269.pp }
 { wrong linenumber for repeat until when type mismatch OK 0.99.12b (PM) }
 
diff --git a/tests/tbf/tb0053.pp b/tests/tbf/tb0053.pp
index 255c827f30..f44455fddc 100644
--- a/tests/tbf/tb0053.pp
+++ b/tests/tbf/tb0053.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0272.pp }
 { No error issued if wrong parameter in function inside a second function OK 0.99.13 (PFV) }
 
diff --git a/tests/tbf/tb0054.pp b/tests/tbf/tb0054.pp
index ee1397e7e3..02bc5b8076 100644
--- a/tests/tbf/tb0054.pp
+++ b/tests/tbf/tb0054.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0281.pp }
 { dup id checking with property is wrong }
 
diff --git a/tests/tbf/tb0055.pp b/tests/tbf/tb0055.pp
index f41605ce11..13a813fa23 100644
--- a/tests/tbf/tb0055.pp
+++ b/tests/tbf/tb0055.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0284.pp }
 { wrong file position with dup id in other unit        OK 0.99.13 (PFV) }
 
diff --git a/tests/tbf/tb0056.pp b/tests/tbf/tb0056.pp
index 5c3a20cf20..f5d292cb1a 100644
--- a/tests/tbf/tb0056.pp
+++ b/tests/tbf/tb0056.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0298.pp }
 { l1+l2:=l1+l2 gives no error                          OK 0.99.13 (PFV) }
 
diff --git a/tests/tbf/tb0057.pp b/tests/tbf/tb0057.pp
index a0b6e4c7f5..09d102cd98 100644
--- a/tests/tbf/tb0057.pp
+++ b/tests/tbf/tb0057.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0300.pp }
 { crash if method on non existing object is parsed (form bugs 651) OK 0.99.13 (PFV) }
 
diff --git a/tests/tbf/tb0058.pp b/tests/tbf/tb0058.pp
index 0995c104fa..97b2f18111 100644
--- a/tests/tbf/tb0058.pp
+++ b/tests/tbf/tb0058.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0301.pp }
 { crash if destructor without object name is parsed    OK 0.99.13 (PFV) }
 
diff --git a/tests/tbf/tb0059.pp b/tests/tbf/tb0059.pp
index 24ef4e1465..3b352b1274 100644
--- a/tests/tbf/tb0059.pp
+++ b/tests/tbf/tb0059.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0310.pp }
 { local and para dup are not detected                    OK 0.99.15 (FK) }
 
diff --git a/tests/tbf/tb0060.pp b/tests/tbf/tb0060.pp
index 2faec32f27..af53226e91 100644
--- a/tests/tbf/tb0060.pp
+++ b/tests/tbf/tb0060.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0311.pp }
 { No dup id checking in variant records                  OK 0.99.15 (FK) }
 
diff --git a/tests/tbf/tb0061.pp b/tests/tbf/tb0061.pp
index b2eed5c1b1..010453c902 100644
--- a/tests/tbf/tb0061.pp
+++ b/tests/tbf/tb0061.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0314.pp }
 {  }
 
diff --git a/tests/tbf/tb0062.pp b/tests/tbf/tb0062.pp
index f19a598ea9..be5fec7f5c 100644
--- a/tests/tbf/tb0062.pp
+++ b/tests/tbf/tb0062.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0315.pp }
 {  }
 
diff --git a/tests/tbf/tb0063.pp b/tests/tbf/tb0063.pp
index 8a5ccc1eac..7fd0c58eb0 100644
--- a/tests/tbf/tb0063.pp
+++ b/tests/tbf/tb0063.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0320.pp }
 {  }
 
diff --git a/tests/tbf/tb0064.pp b/tests/tbf/tb0064.pp
index 768ad76e25..1dc207de06 100644
--- a/tests/tbf/tb0064.pp
+++ b/tests/tbf/tb0064.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0323.pp }
 {  }
 
diff --git a/tests/tbf/tb0065.pp b/tests/tbf/tb0065.pp
index 82cfb9079d..c8d11949a8 100644
--- a/tests/tbf/tb0065.pp
+++ b/tests/tbf/tb0065.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0324.pp }
 {  }
 
diff --git a/tests/tbf/tb0066.pp b/tests/tbf/tb0066.pp
index 515166a778..809a98f02b 100644
--- a/tests/tbf/tb0066.pp
+++ b/tests/tbf/tb0066.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0325.pp }
 {  }
 
diff --git a/tests/tbf/tb0067.pp b/tests/tbf/tb0067.pp
index 1665f91217..ea0c0a1b7c 100644
--- a/tests/tbf/tb0067.pp
+++ b/tests/tbf/tb0067.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0326.pp }
 {  }
 
diff --git a/tests/tbf/tb0068.pp b/tests/tbf/tb0068.pp
index e3cb71dcf6..d3bd62acbb 100644
--- a/tests/tbf/tb0068.pp
+++ b/tests/tbf/tb0068.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0328.pp }
 {  }
 
diff --git a/tests/tbf/tb0069.pp b/tests/tbf/tb0069.pp
index 92214ccb58..58e7bf8c91 100644
--- a/tests/tbf/tb0069.pp
+++ b/tests/tbf/tb0069.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0342.pp }
 {  }
 
diff --git a/tests/tbf/tb0070.pp b/tests/tbf/tb0070.pp
index bc21f57ba7..9cee7f4d4b 100644
--- a/tests/tbf/tb0070.pp
+++ b/tests/tbf/tb0070.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0343.pp }
 {  }
 
diff --git a/tests/tbf/tb0071.pp b/tests/tbf/tb0071.pp
index dddd8d964b..e372074ea8 100644
--- a/tests/tbf/tb0071.pp
+++ b/tests/tbf/tb0071.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0345.pp }
 {  }
 
diff --git a/tests/tbf/tb0072.pp b/tests/tbf/tb0072.pp
index 3c00665702..019932eb51 100644
--- a/tests/tbf/tb0072.pp
+++ b/tests/tbf/tb0072.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0347.pp }
 {  }
 
diff --git a/tests/tbf/tb0073.pp b/tests/tbf/tb0073.pp
index 63a76f3a54..3f7299f04c 100644
--- a/tests/tbf/tb0073.pp
+++ b/tests/tbf/tb0073.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0349.pp }
 {  }
 
diff --git a/tests/tbf/tb0074.pp b/tests/tbf/tb0074.pp
index 47b63f3721..49c1231bff 100644
--- a/tests/tbf/tb0074.pp
+++ b/tests/tbf/tb0074.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { %OPT=-Sew }
 
 { Old file: tbf0351.pp }
diff --git a/tests/tbf/tb0075.pp b/tests/tbf/tb0075.pp
index bad7b6481e..170b6fa04a 100644
--- a/tests/tbf/tb0075.pp
+++ b/tests/tbf/tb0075.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0352.pp }
 {  }
 
diff --git a/tests/tbf/tb0076.pp b/tests/tbf/tb0076.pp
index e377b4b63e..97b9edeab6 100644
--- a/tests/tbf/tb0076.pp
+++ b/tests/tbf/tb0076.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0353.pp }
 {  }
 
diff --git a/tests/tbf/tb0077.pp b/tests/tbf/tb0077.pp
index 62730a6fc1..a08f0342bc 100644
--- a/tests/tbf/tb0077.pp
+++ b/tests/tbf/tb0077.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0354.pp }
 {  }
 
diff --git a/tests/tbf/tb0078.pp b/tests/tbf/tb0078.pp
index c2f588e714..0f245d72d5 100644
--- a/tests/tbf/tb0078.pp
+++ b/tests/tbf/tb0078.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0355.pp }
 {  }
 
diff --git a/tests/tbf/tb0079.pp b/tests/tbf/tb0079.pp
index 49211bc056..ca11233356 100644
--- a/tests/tbf/tb0079.pp
+++ b/tests/tbf/tb0079.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0356.pp }
 {  }
 
diff --git a/tests/tbf/tb0080.pp b/tests/tbf/tb0080.pp
index fcb94bc7e7..5dfb22792c 100644
--- a/tests/tbf/tb0080.pp
+++ b/tests/tbf/tb0080.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0357.pp }
 {  }
 
diff --git a/tests/tbf/tb0081.pp b/tests/tbf/tb0081.pp
index 3f1cfd9574..43fec1957a 100644
--- a/tests/tbf/tb0081.pp
+++ b/tests/tbf/tb0081.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0358.pp }
 {  }
 
diff --git a/tests/tbf/tb0082.pp b/tests/tbf/tb0082.pp
index 4154523e52..32d3b08608 100644
--- a/tests/tbf/tb0082.pp
+++ b/tests/tbf/tb0082.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0359.pp }
 {  }
 
diff --git a/tests/tbf/tb0083.pp b/tests/tbf/tb0083.pp
index 99b8e66ddc..654b86eda0 100644
--- a/tests/tbf/tb0083.pp
+++ b/tests/tbf/tb0083.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0360.pp }
 {  }
 
diff --git a/tests/tbf/tb0084.pp b/tests/tbf/tb0084.pp
index b647d8d106..6760673a04 100644
--- a/tests/tbf/tb0084.pp
+++ b/tests/tbf/tb0084.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0361.pp }
 {  }
 
diff --git a/tests/tbf/tb0085.pp b/tests/tbf/tb0085.pp
index 227e351a77..a902ff4e49 100644
--- a/tests/tbf/tb0085.pp
+++ b/tests/tbf/tb0085.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 
 type
   r=record
diff --git a/tests/tbf/tb0086.pp b/tests/tbf/tb0086.pp
index bc881bbccd..0f29b21559 100644
--- a/tests/tbf/tb0086.pp
+++ b/tests/tbf/tb0086.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 
 var
   i,j : longint;
diff --git a/tests/tbf/tb0087.pp b/tests/tbf/tb0087.pp
index aa9e56898b..79ef51aaee 100644
--- a/tests/tbf/tb0087.pp
+++ b/tests/tbf/tb0087.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$mode objfpc}
 label l;
 
diff --git a/tests/tbf/tb0088.pp b/tests/tbf/tb0088.pp
index e73b2a460e..43042dad86 100644
--- a/tests/tbf/tb0088.pp
+++ b/tests/tbf/tb0088.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$mode objfpc}
 label l;
 
diff --git a/tests/tbf/tb0089.pp b/tests/tbf/tb0089.pp
index d07c380d99..2418a5a926 100644
--- a/tests/tbf/tb0089.pp
+++ b/tests/tbf/tb0089.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$mode objfpc}
 label l;
 
diff --git a/tests/tbf/tb0090.pp b/tests/tbf/tb0090.pp
index 1b7798f94c..ef67b891ab 100644
--- a/tests/tbf/tb0090.pp
+++ b/tests/tbf/tb0090.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$mode objfpc}
 uses
    sysutils;
diff --git a/tests/tbf/tb0091.pp b/tests/tbf/tb0091.pp
index a541df99d8..ffb6d86cfe 100644
--- a/tests/tbf/tb0091.pp
+++ b/tests/tbf/tb0091.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$mode objfpc}
 type
    tc1 = class
diff --git a/tests/tbf/tb0092.pp b/tests/tbf/tb0092.pp
index cce0e21c91..394e81e9bb 100644
--- a/tests/tbf/tb0092.pp
+++ b/tests/tbf/tb0092.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 
 
 type
diff --git a/tests/tbf/tb0093.pp b/tests/tbf/tb0093.pp
index 32985f1c04..c2bf60b3b6 100644
--- a/tests/tbf/tb0093.pp
+++ b/tests/tbf/tb0093.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$mode objfpc}
 type
    to1 = class
diff --git a/tests/tbf/tb0094.pp b/tests/tbf/tb0094.pp
index b4bb3ca4b8..f061bab8be 100644
--- a/tests/tbf/tb0094.pp
+++ b/tests/tbf/tb0094.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbf0008.pp }
 {  tests the crash when decrementing constants         OK 0.9.2 }
 
diff --git a/tests/tbf/tb0095.pp b/tests/tbf/tb0095.pp
index 5cbe64ad93..dfa85a20e3 100644
--- a/tests/tbf/tb0095.pp
+++ b/tests/tbf/tb0095.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Old file: tbs0356.pp }
 {  }
 
diff --git a/tests/tbs/tb0133.pp b/tests/tbs/tb0133.pp
index f0cc3c8bf5..2d4ba25d02 100644
--- a/tests/tbs/tb0133.pp
+++ b/tests/tbs/tb0133.pp
@@ -1,7 +1,7 @@
 { Old file: tbs0156a.pp }
 {  }
 
-uses tb0133;
+uses ub0133;
 
 begin
 end.
diff --git a/tests/tbs/tb0308.pp b/tests/tbs/tb0308.pp
index a713f78ec1..9195bbb837 100644
--- a/tests/tbs/tb0308.pp
+++ b/tests/tbs/tb0308.pp
@@ -1,5 +1,5 @@
 uses
-   tb0308;
+   ub0308;
 
   var
      r : tr;
diff --git a/tests/tbs/tb0307.pp b/tests/tbs/ub0308.pp
similarity index 91%
rename from tests/tbs/tb0307.pp
rename to tests/tbs/ub0308.pp
index 148aeff6df..b60984bee7 100644
--- a/tests/tbs/tb0307.pp
+++ b/tests/tbs/ub0308.pp
@@ -1,4 +1,4 @@
-unit tb0307;
+unit ub0308;
 
   interface
 
diff --git a/tests/test/tinterface1.pp b/tests/test/tinterface1.pp
index 3d54b8fb2d..05d63779d1 100644
--- a/tests/test/tinterface1.pp
+++ b/tests/test/tinterface1.pp
@@ -1,3 +1,5 @@
+{ %VERSION=1.1 }
+
 {$mode objfpc}
 type
   IInterface = interface(IUnknown)
diff --git a/tests/test/tinterface2.pp b/tests/test/tinterface2.pp
index bfe3bb3236..4523240d0f 100644
--- a/tests/test/tinterface2.pp
+++ b/tests/test/tinterface2.pp
@@ -1,4 +1,5 @@
-{ $version >= 1.1}
+{ %VERSION=1.1 }
+
 {$mode objfpc}
 type
   ITest = interface(IUnknown)
diff --git a/tests/test/tinterface3.pp b/tests/test/tinterface3.pp
index b89ef6958e..86be926c9a 100644
--- a/tests/test/tinterface3.pp
+++ b/tests/test/tinterface3.pp
@@ -1,4 +1,5 @@
-{ $version >= 1.1}
+{ %VERSION=1.1 }
+
 {$mode objfpc}
 type
   IMyInterface = interface
diff --git a/tests/test/trange1.pp b/tests/test/trange1.pp
index e2170e022b..28f14c1e5b 100644
--- a/tests/test/trange1.pp
+++ b/tests/test/trange1.pp
@@ -1,3 +1,5 @@
+{ %VERSION=1.1 }
+
 {$mode objfpc}
 uses sysutils;
 
diff --git a/tests/test/trtti1.pp b/tests/test/trtti1.pp
index 89c6372c7f..ce8ccbf9a1 100644
--- a/tests/test/trtti1.pp
+++ b/tests/test/trtti1.pp
@@ -10,7 +10,8 @@ Const TypeNames : Array [TTYpeKind] of string[15] =
                     ('Unknown','Integer','Char','Enumeration',
                      'Float','Set','Method','ShortString','LongString',
                      'AnsiString','WideString','Variant','Array','Record',
-                     'Interface','Class','Object','WideChar','Bool','Int64','QWord');
+                     'Interface','Class','Object','WideChar','Bool','Int64','QWord',
+                     'DynamicArray','RawInterface');
 
 Const OrdinalTypes = [tkInteger,tkChar,tkENumeration,tkbool];
 
diff --git a/tests/test/trtti2.pp b/tests/test/trtti2.pp
index f3a4366d7c..04c1bbc80d 100644
--- a/tests/test/trtti2.pp
+++ b/tests/test/trtti2.pp
@@ -1,3 +1,5 @@
+{ %VERSION=1.1 }
+
 type
    pbyte = ^byte;
 
@@ -5,4 +7,4 @@ begin
    if (pbyte(typeinfo(longint))^<>1 then
      halt(1);
 end.
-   
+
diff --git a/tests/test/trtti3.pp b/tests/test/trtti3.pp
index bf5c925d52..f4d546ded3 100644
--- a/tests/test/trtti3.pp
+++ b/tests/test/trtti3.pp
@@ -1,3 +1,5 @@
+{ %VERSION=1.1 }
+
 {$mode delphi}
 var
    a,c1,c2 : ansistring;
diff --git a/tests/utils/dotest.pp b/tests/utils/dotest.pp
index dc5582aa3a..c4d500724f 100644
--- a/tests/utils/dotest.pp
+++ b/tests/utils/dotest.pp
@@ -8,11 +8,11 @@ const
   ExeExt='';
 {$else UNIX}
   ExeExt:='exe';
-{$endif UNIX}    
-  
+{$endif UNIX}
+
 type
   TVerboseLevel=(V_Abort,V_Error,V_Warning,V_Normal,V_Debug);
-  
+
   TConfig = record
     NeedOptions,
     NeedCPU,
@@ -20,6 +20,7 @@ type
     ResultCode    : longint;
     IsInteractive : boolean;
     UsesGraph     : boolean;
+    ShouldFail    : boolean;
     Category      : string;
   end;
 
@@ -30,7 +31,7 @@ var
   CompilerVersion : string;
   PPFile : string;
   TestName : string;
-  
+
 const
   ResLogfile  : string[32] = 'log';
   LongLogfile : string[32] = 'longlog';
@@ -38,7 +39,8 @@ const
   DoVerbose : boolean = false;
   DoGraph : boolean = false;
   DoInteractive : boolean = false;
-    
+  DoExecute : boolean = false;
+
 procedure Verbose(lvl:TVerboseLevel;const s:string);
 begin
   case lvl of
@@ -52,14 +54,14 @@ begin
     V_Error :
       begin
         writeln('Error: ',s);
-	halt(1);
-      end;	
+        halt(1);
+      end;
     V_Abort :
       begin
         writeln('Abort: ',s);
-	halt(0);
-      end;	
-  end;      
+        halt(0);
+      end;
+  end;
 end;
 
 
@@ -135,9 +137,9 @@ begin
    dec(j);
   if j=0 then
    j:=255;
-  if Ext<>'' then 
+  if Ext<>'' then
    ForceExtension:=Copy(Hstr,1,j-1)+'.'+Ext
-  else 
+  else
    ForceExtension:=Copy(Hstr,1,j-1);
 end;
 
@@ -169,7 +171,7 @@ begin
      if ioresult<>0 then
       append:=false
      else
-      seek(g,filesize(g)); 
+      seek(g,filesize(g));
    end;
   if not append then
    begin
@@ -179,14 +181,14 @@ begin
      if ioresult<>0 then
       Verbose(V_Error,'Can''t open '+fn2+' for output');
    end;
-  getmem(buf,bufsize); 
+  getmem(buf,bufsize);
   repeat
     blockread(f,buf^,bufsize,i);
     blockwrite(g,buf^,i);
-  until i<bufsize;  
+  until i<bufsize;
   freemem(buf,bufsize);
   close(f);
-  close(g);      
+  close(g);
 end;
 
 
@@ -207,7 +209,7 @@ begin
       Verbose(V_Abort,'Can''t append to '+logfile);
    end;
   writeln(t,s);
-  close(t);      
+  close(t);
 end;
 
 
@@ -235,13 +237,13 @@ var
              i:=pos('}',s);
              if i=0 then
               i:=255
-	     else
-	      dec(i); 
+             else
+              dec(i);
              res:=Copy(s,1,i);
              TrimB(res);
              TrimE(res);
            end;
-	  Verbose(V_Debug,'Config: '+Entry+' = "'+Res+'"'); 
+          Verbose(V_Debug,'Config: '+Entry+' = "'+Res+'"');
           GetEntry:=true;
         end;
      end;
@@ -257,8 +259,8 @@ begin
   if ioresult<>0 then
    begin
      Verbose(V_Error,'Can''t open '+fn);
-     exit; 
-   end;  
+     exit;
+   end;
   while not eof(t) do
    begin
      readln(t,s);
@@ -282,14 +284,17 @@ begin
               else
                if GetEntry('RESULT') then
                 Val(res,r.ResultCode,code)
-              else		
+              else
                if GetEntry('GRAPH') then
                 r.UsesGraph:=true
-              else		
+              else
+               if GetEntry('FAIL') then
+                r.ShouldFail:=true
+              else
                if GetEntry('INTERACTIVE') then
                 r.IsInteractive:=true
               else
-	       Verbose(V_Error,'Unknown entry: '+s);
+               Verbose(V_Error,'Unknown entry: '+s);
             end;
          end
         else
@@ -320,7 +325,7 @@ begin
    begin
      Verbose(V_Debug,'Current Compiler Version: '+CompilerVersion);
      GetCompilerVersion:=true;
-   end; 
+   end;
 end;
 
 
@@ -343,7 +348,7 @@ begin
    begin
      Verbose(V_Debug,'Current Compiler CPU Target: '+CompilerCPU);
      GetCompilerCPU:=true;
-   end; 
+   end;
 end;
 
 
@@ -357,22 +362,43 @@ begin
   args:='-Fuunits';
   if Config.NeedOptions<>'' then
    args:=args+' '+Config.NeedOptions;
-  args:=args+' '+ppfile; 
+  args:=args+' '+ppfile;
   Verbose(V_Debug,'Executing '+compilerbin+' '+args);
   ExecuteRedir(CompilerBin,args,'',OutName,'');
-  if ExecuteResult<>0 then
+  { Shoud the compile fail ? }
+  if Config.ShouldFail then
    begin
-     AddLog(FailLogFile,TestName);
-     AddLog(ResLogFile,'Failed to compile '+PPFile);
-     AddLog(LongLogFile,'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>');
-     CopyFile(OutName,LongLogFile,true);
-     Verbose(V_Abort,'Exitcode: '+ToStr(ExecuteResult)+' (expected 0)');
+     if ExecuteResult<>0 then
+      begin
+        AddLog(ResLogFile,'Success, compilation failed '+PPFile);
+        RunCompiler:=true;
+      end
+     else
+      begin
+        AddLog(FailLogFile,TestName);
+        AddLog(ResLogFile,'Failed, compilation successfull '+PPFile);
+        AddLog(LongLogFile,'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>');
+        AddLog(LongLogFile,'Failed, compilation successfull '+PPFile);
+        CopyFile(OutName,LongLogFile,true);
+      end;
    end
   else
    begin
-     AddLog(ResLogFile,'Successfully compiled '+PPFile);
-     RunCompiler:=true;
-   end;   
+     if ExecuteResult<>0 then
+      begin
+        AddLog(FailLogFile,TestName);
+        AddLog(ResLogFile,'Failed to compile '+PPFile);
+        AddLog(LongLogFile,'>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>');
+        AddLog(LongLogFile,'Failed to compile '+PPFile);
+        CopyFile(OutName,LongLogFile,true);
+        Verbose(V_Abort,'Exitcode: '+ToStr(ExecuteResult)+' (expected 0)');
+      end
+     else
+      begin
+        AddLog(ResLogFile,'Successfully compiled '+PPFile);
+        RunCompiler:=true;
+      end;
+   end;
 end;
 
 
@@ -399,7 +425,7 @@ begin
    begin
      AddLog(ResLogFile,'Successfully run '+PPFile);
      RunExecutable:=true;
-   end;   
+   end;
 end;
 
 
@@ -412,10 +438,13 @@ var
   procedure helpscreen;
   begin
     writeln('dotest [Options] <File>');
-    Writeln;
-    Writeln('Options can be:');
+    writeln;
+    writeln('Options can be:');
     writeln('  -C<compiler>  set compiler to use');
     writeln('  -V            verbose');
+    writeln('  -E            execute test also');
+    writeln('  -G            include graph tests');
+    writeln('  -I            include interactive tests');
     halt(1);
   end;
 
@@ -430,10 +459,11 @@ begin
         ch:=Upcase(para[2]);
         delete(para,1,2);
         case ch of
-	 'C' : CompilerBin:=Para;
-	 'V' : DoVerbose:=true;
-	 'G' : DoGraph:=true;
-	 'I' : DoInteractive:=true;
+         'C' : CompilerBin:=Para;
+         'E' : DoExecute:=true;
+         'G' : DoGraph:=true;
+         'I' : DoInteractive:=true;
+         'V' : DoVerbose:=true;
         end;
      end
     else
@@ -443,7 +473,7 @@ begin
     end;
   if (PPFile='') then
    HelpScreen;
-  TestName:=Copy(PPFile,1,Pos('.pp',PPFile)-1); 
+  TestName:=Copy(PPFile,1,Pos('.pp',PPFile)-1);
   Verbose(V_Debug,'Running test '+TestName+', file '+PPFile);
 end;
 
@@ -452,7 +482,6 @@ procedure RunTest;
 var
   Res : boolean;
 begin
-  Verbose(V_Normal,'Running test '+TestName);  
   Res:=GetConfig(ppfile,Config);
 
   if Res then
@@ -461,56 +490,59 @@ begin
       begin
         Verbose(V_Abort,'Skipping test because it uses graph');
         Res:=false;
-      end;  
+      end;
    end;
-   
+
   if Res then
    begin
      if Config.IsInteractive and (not DoInteractive) then
       begin
         Verbose(V_Abort,'Skipping test because it is interactive');
         Res:=false;
-      end;  
+      end;
    end;
-   
+
   if Res then
    begin
      if Config.NeedVersion<>'' then
       begin
         Verbose(V_Debug,'Required compiler version: '+Config.NeedVersion);
-        Res:=GetCompilerVersion;  
-        if Config.NeedVersion<CompilerVersion then
-	 begin
+        Res:=GetCompilerVersion;
+        if CompilerVersion<Config.NeedVersion then
+         begin
            Verbose(V_Abort,'Compiler version to low '+CompilerVersion+' < '+Config.NeedVersion);
-	   Res:=false;
-	 end;  
-      end;  
-   end;    
+           Res:=false;
+         end;
+      end;
+   end;
 
   if Res then
    begin
      if Config.NeedCPU<>'' then
       begin
         Verbose(V_Debug,'Required compiler cpu: '+Config.NeedCPU);
-        Res:=GetCompilerVersion;  
-        if Upper(Config.NeedCPU)<Upper(CompilerCPU) then
-	 begin
+        Res:=GetCompilerVersion;
+        if Upper(Config.NeedCPU)<>Upper(CompilerCPU) then
+         begin
            Verbose(V_Abort,'Compiler cpu wrong '+CompilerCPU+' <> '+Config.NeedCPU);
-	   Res:=false;
-	 end;  
-      end;  
-   end;    
+           Res:=false;
+         end;
+      end;
+   end;
 
   if Res then
    Res:=RunCompiler;
 
   if Res then
    begin
-     if FileExists(ForceExtension(PPFile,'ppu')) or
-        FileExists(ForceExtension(PPFile,'ppw')) then
-      Verbose(V_Debug,'Unit found, skipping run test')
-     else      
-      Res:=RunExecutable;
+     if (not Config.ShouldFail) and DoExecute then
+      begin
+        if FileExists(ForceExtension(PPFile,'ppu')) or
+           FileExists(ForceExtension(PPFile,'ppw')) then
+         Verbose(V_Debug,'Unit found, skipping run test')
+        else
+         Res:=RunExecutable;
+      end;
    end;
 end;
 
diff --git a/tests/webtbf/tw0744.pp b/tests/webtbf/tw0744.pp
index 17be70cc41..92690ffad2 100644
--- a/tests/webtbf/tw0744.pp
+++ b/tests/webtbf/tw0744.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 Unit tw0744;
 
 Interface
diff --git a/tests/webtbf/tw0784.pp b/tests/webtbf/tw0784.pp
index ba6f9d61cf..3dab89c37b 100644
--- a/tests/webtbf/tw0784.pp
+++ b/tests/webtbf/tw0784.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$R+}
 { should not compile if range check on }
 program BigRange;
diff --git a/tests/webtbf/tw0807.pp b/tests/webtbf/tw0807.pp
index e0d3cdc10b..e0a3202efd 100644
--- a/tests/webtbf/tw0807.pp
+++ b/tests/webtbf/tw0807.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$mode objfpc}
 
 Program test;
diff --git a/tests/webtbf/tw0856.pp b/tests/webtbf/tw0856.pp
index b93d7bbc9e..4eb3e6225c 100644
--- a/tests/webtbf/tw0856.pp
+++ b/tests/webtbf/tw0856.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$MODE objfpc}
 uses
   uw0856;
diff --git a/tests/webtbf/tw0890.pp b/tests/webtbf/tw0890.pp
index 0de365d363..66181c5c70 100644
--- a/tests/webtbf/tw0890.pp
+++ b/tests/webtbf/tw0890.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 {$ifdef FPC}
   {$MODE TP}
 {$endif FPC}
diff --git a/tests/webtbf/tw0896.pp b/tests/webtbf/tw0896.pp
index 7e1032cdc4..e65762eb94 100644
--- a/tests/webtbf/tw0896.pp
+++ b/tests/webtbf/tw0896.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 
 var
   dat : file;
diff --git a/tests/webtbf/tw0896a.pp b/tests/webtbf/tw0896a.pp
index e27b9fe521..9144e6de8f 100644
--- a/tests/webtbf/tw0896a.pp
+++ b/tests/webtbf/tw0896a.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 
 var
   dat : file of byte;
diff --git a/tests/webtbf/tw1157a.pp b/tests/webtbf/tw1157a.pp
index 3472ecc147..d7799e3c95 100644
--- a/tests/webtbf/tw1157a.pp
+++ b/tests/webtbf/tw1157a.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Source provided for Free Pascal Bug Report 1157 }
 { Submitted by "Colin Goldie" on  2000-10-06 }
 { e-mail: Colin_G@Positek.com.au }
diff --git a/tests/webtbf/tw1157b.pp b/tests/webtbf/tw1157b.pp
index cc63909463..a4d5c31080 100644
--- a/tests/webtbf/tw1157b.pp
+++ b/tests/webtbf/tw1157b.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Source provided for Free Pascal Bug Report 1157 }
 { Submitted by "Colin Goldie" on  2000-10-06 }
 { e-mail: Colin_G@Positek.com.au }
diff --git a/tests/webtbf/tw1238.pp b/tests/webtbf/tw1238.pp
index 7e948d32a6..3b72df975d 100644
--- a/tests/webtbf/tw1238.pp
+++ b/tests/webtbf/tw1238.pp
@@ -1,3 +1,4 @@
+{ %FAIL }
 { Source provided for Free Pascal Bug Report 1238 }
 { Submitted by "Mazen NEIFER" on  2000-11-14 }
 { e-mail: mazen_neifer@ayna.com }
diff --git a/tests/webtbs/tw1251a.pp b/tests/webtbf/tw1251a.pp
similarity index 93%
rename from tests/webtbs/tw1251a.pp
rename to tests/webtbf/tw1251a.pp
index cdd7d48b4c..a154134245 100644
--- a/tests/webtbs/tw1251a.pp
+++ b/tests/webtbf/tw1251a.pp
@@ -1,10 +1,12 @@
+{ %FAIL }
+
 {$mode objfpc}
 
-begin
-  try
-    writeln ('Start: create game object');
-  except
-    on e : exception do
-      writeln ('Exception: ', e.message);
-  end;
-end.
+begin
+  try
+    writeln ('Start: create game object');
+  except
+    on e : exception do
+      writeln ('Exception: ', e.message);
+  end;
+end.
diff --git a/tests/webtbs/tw0711.pp b/tests/webtbs/tw0711.pp
index 0cd0c5f60c..b3cf326872 100644
--- a/tests/webtbs/tw0711.pp
+++ b/tests/webtbs/tw0711.pp
@@ -1,3 +1,5 @@
+{ %GRAPH }
+
 program TestGetPutim; {Compiled with the 0.99.13 version under GO32V2!}
 
 uses
diff --git a/tests/webtbs/tw0895.pp b/tests/webtbs/tw0895.pp
index 7d096b022a..942739602c 100644
--- a/tests/webtbs/tw0895.pp
+++ b/tests/webtbs/tw0895.pp
@@ -11,4 +11,9 @@ begin
   InOutRes:=0;
   {$I+}
   writeln('This is a test');
+  {$I-}
+  rmdir('test895');
+  InOutRes:=0;
+  {$I+}
+  writeln('This is a test');
 end.
\ No newline at end of file
diff --git a/tests/webtbs/tw1068.pp b/tests/webtbs/tw1068.pp
index 01c6c16fea..c01703030f 100644
--- a/tests/webtbs/tw1068.pp
+++ b/tests/webtbs/tw1068.pp
@@ -1,3 +1,5 @@
+{ %VERSION=1.1 }
+
 PROGRAM bug1068;
 VAR i: INT64;
     s : string;
diff --git a/tests/webtbs/tw1204.pp b/tests/webtbs/tw1204.pp
index 46a20525da..fe7444c4f2 100644
--- a/tests/webtbs/tw1204.pp
+++ b/tests/webtbs/tw1204.pp
@@ -2,7 +2,9 @@
 { Submitted by "Marco van de Voort" on  2000-10-29 }
 { e-mail: marco@freepascal.org }
 
-Uses Windows,Sysutils,Classes;
+{$mode delphi}
+
+Uses Sysutils,Classes;
 
 type
   TICMPDisplay = procedure(Sender: TObject; Msg : String) of object;
@@ -12,17 +14,14 @@ object;
   // The object wich encapsulate the ICMP.DLL
   TICMP = class(TObject)
   private
-    FOnDisplay :      TICMPDisplay;               // Event handler to
-display
+    FOnDisplay :      TICMPDisplay;               // Event handler to display
   public
     constructor Create; virtual;
     destructor  Destroy; override;
-    property OnDisplay     : TICMPDisplay   read  FOnDisplay write
-FOnDisplay;
+    property OnDisplay     : TICMPDisplay   read  FOnDisplay write FOnDisplay;
   end;
 
-  TPingDisplay   = procedure(Sender: TObject; Icmp: TObject; Msg :
-String) of object;
+  TPingDisplay   = procedure(Sender: TObject; Icmp: TObject; Msg : String) of object;
 
 
   TPing = class(TComponent)
diff --git a/tests/webtbs/tw1250.pp b/tests/webtbs/tw1250.pp
index 6daef31b1f..c02ad99b0b 100644
--- a/tests/webtbs/tw1250.pp
+++ b/tests/webtbs/tw1250.pp
@@ -1,3 +1,5 @@
+{$mode objfpc}
+
 uses classes;
 
 var list : TStringList;