diff --git a/8086/msdos/Makefile b/8086/msdos/Makefile
index b5ac5cc..01e6242 100644
--- a/8086/msdos/Makefile
+++ b/8086/msdos/Makefile
@@ -6,7 +6,7 @@ fbfiles_uppercase = $(wildcard src/*.FB tests/*.FB)
 fthfiles_caseconverted = $(patsubst %.fb, %.fth, \
     $(shell ../../tools/echo-tolower.py $(fbfiles_uppercase)))
 
-test: incltest.result logtest.result test-min.result \
+test: incltest.result logtest.result test-min.result test-std.result \
     incltest-volks4th.result test-volks4th-min.result
 
 fth: $(fthfiles) $(fthfiles_caseconverted)
@@ -76,6 +76,14 @@ test-min.log: \
 	    "include logprep.fth include test-min.fth")
 	dos2unix -n dosfiles/OUTPUT.LOG $@
 
+test-std.log: \
+    $(patsubst %, dosfiles/%, v4th.com $(prepsrcs)) \
+    $(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*))
+	rm -f dosfiles/OUTPUT.LOG
+	(cd dosfiles && ../emulator/run-in-dosbox.sh v4th.com \
+	    "include logprep.fth include test-std.fth")
+	dos2unix -n dosfiles/OUTPUT.LOG $@
+
 
 incltest-volks4th.log: v4thfile.com tests/log2file.fb tests/incltest.fth
 	rm -f OUTPUT.LOG
@@ -95,15 +103,15 @@ run-editor: volks4th.com emulator/run-in-dosbox.sh
 
 
 test-min.golden: $(patsubst %, tests/golden/%.golden, prelim core)
-	cat $? > $@
+	cat $^ > $@
 
 test-std.golden: $(patsubst %, tests/golden/%.golden, \
-    prelim core coreext double report-noblk)
-	cat $? > $@
+    prelim core coreplus coreext doubltst report-noblk)
+	cat $^ > $@
 
 test-volks4th-min.golden: $(patsubst %, tests/golden/%.golden, \
     volks4th-prelim core)
-	cat $? > $@
+	cat $^ > $@
 
 
 %.golden: tests/golden/%.golden
diff --git a/8086/msdos/tests/double.fth b/8086/msdos/tests/doubltst.fth
similarity index 100%
rename from 8086/msdos/tests/double.fth
rename to 8086/msdos/tests/doubltst.fth
diff --git a/8086/msdos/tests/golden/coreext.golden b/8086/msdos/tests/golden/coreext.golden
index ddf90a8..4b81e2d 100644
--- a/8086/msdos/tests/golden/coreext.golden
+++ b/8086/msdos/tests/golden/coreext.golden
@@ -1,9 +1,9 @@
 
-utilities.fth ?DEFTEST1 exists
+UTIL.FTH  ?DEFTEST1 exists
 Test utilities loaded
 
-errorreport.fth
-coreexttest.fth**************
+ERRORREP.FTH
+COREEXT.FTH **************
 
 Output from .(
 You should see -9876: -9876
diff --git a/8086/msdos/tests/golden/coreplus.golden b/8086/msdos/tests/golden/coreplus.golden
index b6ea7aa..0c3fde5 100644
--- a/8086/msdos/tests/golden/coreplus.golden
+++ b/8086/msdos/tests/golden/coreplus.golden
@@ -1,5 +1,5 @@
 
-COREPLUS.FTH********
+COREPLUS.FTH ********
 You should see 2345: 2345
 *****
 End of additional Core tests
diff --git a/8086/msdos/tests/golden/double.golden b/8086/msdos/tests/golden/doubltst.golden
similarity index 50%
rename from 8086/msdos/tests/golden/double.golden
rename to 8086/msdos/tests/golden/doubltst.golden
index ad02caf..146428f 100644
--- a/8086/msdos/tests/golden/double.golden
+++ b/8086/msdos/tests/golden/doubltst.golden
@@ -1,3 +1,3 @@
 
-doubletest.fth*****************
+DOUBLTST.FTH *****************
 End of Double-Number word tests
diff --git a/8086/msdos/tests/test-std.fth b/8086/msdos/tests/test-std.fth
index 97bb1fb..baaea50 100644
--- a/8086/msdos/tests/test-std.fth
+++ b/8086/msdos/tests/test-std.fth
@@ -1,11 +1,15 @@
 
+\ : .blk|tib
+\     blk @ ?dup IF  ."  Blk " u. ?cr  exit THEN
+\     incfile @ IF tib #tib @ cr type THEN ;
+
 include log2file.fth
 logopen output.log
 
 include ans-shim.fth
 : \vf  [compile] \ ; immediate
 
-include prelimtest.fth
+include prelim.fth
 include tester.fth
 \ 1 verbose !
 include core.fr
@@ -15,7 +19,10 @@ include util.fth
 include errorrep.fth
 
 include coreext.fth
-include double.fth
+
+\ ' .blk|tib Is .status
+
+include doubltst.fth
 
 REPORT-ERRORS