diff --git a/8080/CPM/Makefile b/8080/CPM/Makefile
index c8810d6..9059691 100644
--- a/8080/CPM/Makefile
+++ b/8080/CPM/Makefile
@@ -155,14 +155,15 @@ $(cpmfilesdir)/v4th3.com: \
 
 test-kernel.log: \
     $(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb \
-    include.fb log2file.fb \
-    ans-shim.fth prelim.fth tester.fth core.fr test-min.fth) \
+    include.fb log2file.fb core.fr) \
+    $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fth)) \
     | emu
 	./emulator/run-in-runcpm.sh \
 	    "kernel fileint.fb" \
 	    "1 load onlyforth" \
+	    "$50 constant /tib" \
 	    "include include.fb" \
-	    "include test-min.fth" \
+	    "include test-krn.fth" \
 	    "bye" \
 	    "exit"
 	dos2unix -n $(runcpmdir)/logfile.txt $@
@@ -241,7 +242,8 @@ test3.golden: $(patsubst %, tests/golden/%.golden, \
     prelim core coreplus coreext doubltst report-noblk)
 	cat $^ > $@
 
-test-kernel.golden: $(patsubst %, tests/golden/%.golden, prelim core)
+test-kernel.golden: $(patsubst %, tests/golden/%.golden, \
+    prelim core coreplus coreext report-nodbl)
 	cat $^ > $@
 
 %.golden: tests/golden/%.golden
diff --git a/8080/CPM/tests/golden/report-nodbl.golden b/8080/CPM/tests/golden/report-nodbl.golden
new file mode 100644
index 0000000..3599fc0
--- /dev/null
+++ b/8080/CPM/tests/golden/report-nodbl.golden
@@ -0,0 +1,22 @@
+
+---------------------------
+        Error Report
+Word Set             Errors
+---------------------------
+Core                    0
+Core extension          0
+Block                   -
+Double number           -
+Exception               -
+Facility                -
+File-access             -
+Locals                  -
+Memory-allocation       -
+Programming-tools       -
+Search-order            -
+String                  -
+---------------------------
+Total                   0
+---------------------------
+
+
diff --git a/8080/CPM/tests/test-krn.fth b/8080/CPM/tests/test-krn.fth
new file mode 100644
index 0000000..60373be
--- /dev/null
+++ b/8080/CPM/tests/test-krn.fth
@@ -0,0 +1,22 @@
+
+include log2file.fb
+logopen
+
+include ans-shim.fth
+: \vf  [compile] \ ; immediate
+
+include prelim.fth
+include tester.fth
+
+\ 1 verbose !
+include core.fr
+include coreplus.fth
+
+include util.fth
+include errorrep.fth
+
+include coreext.fth
+
+REPORT-ERRORS
+
+logclose