Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -27,11 +27,11 @@
 # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE")
 # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr)
 ARCHSTR=$(shell lsb_release -sr)
 # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
-all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard newdboard txtdb
+all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard txtdb
 
 refdb : txtdb/txtdb.scm
 	csc -I txtdb txtdb/txtdb.scm -o refdb
 
 mtest: $(OFILES) megatest.o

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -397,12 +397,13 @@
 
     (cond
      ;; all prereqs met, fire off the test
      ;; or, if it is a 'toplevel test and all prereqs not met are COMPLETED then launch
 
-     ((member (hash-table-ref/default test-registry (runs:make-full-test-name hed item-path) 'n/a)
-	      '(DONOTRUN removed)) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
+     ((and (not (member 'toplevel testmode))
+	   (member (hash-table-ref/default test-registry (runs:make-full-test-name hed item-path) 'n/a)
+		   '(DONOTRUN removed CANNOTRUN))) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
       (debug:print-info 1 "Test " hed " set to \"" (hash-table-ref test-registry (runs:make-full-test-name hed item-path)) "\". Removing it from the queue")
       (if (or (not (null? tal))
 	      (not (null? reg)))
 	  (list (runs:queue-next-hed tal reg reglen regfull)
 		(runs:queue-next-tal tal reg reglen regfull)