Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two digit decimal
 ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.5503)
+(define megatest-version 1.5504)
 

Index: run-tests-queue-new.scm
==================================================================
--- run-tests-queue-new.scm
+++ run-tests-queue-new.scm
@@ -1,8 +1,8 @@
 
 ;; test-records is a hash table testname:item_path => vector < testname testconfig waitons priority items-info ... >
-(define (runs:run-tests-queue-new run-id runname test-records keyvals flags test-patts required-tests reglen)
+(define (runs:run-tests-queue-new run-id runname test-records keyvals flags test-patts required-tests reglen-in)
   ;; At this point the list of parent tests is expanded 
   ;; NB// Should expand items here and then insert into the run queue.
   (debug:print 5 "test-records: " test-records ", flags: " (hash-table->alist flags))
   (let ((run-info              (cdb:remote-run db:get-run-info #f run-id))
 	(tests-info            (mt:get-tests-for-run run-id #f '() '())) ;;  qryvals: "id,testname,item_path"))
@@ -12,11 +12,12 @@
 	(num-retries           0)
 	(max-retries           (config-lookup *configdat* "setup" "maxretries"))
 	(max-concurrent-jobs   (let ((mcj (config-lookup *configdat* "setup"     "max_concurrent_jobs")))
 				 (if (and mcj (string->number mcj))
 				     (string->number mcj)
-				     1)))) ;; length of the register queue ahead
+				     1))) ;; length of the register queue ahead
+	(reglen                (if (number? reglen-in) reglen-in 1)))
     ;; Initialize the test-registery hash with tests that already have a record
     (for-each (lambda (trec)
 		(let ((id (db:test-get-id        trec))
 		      (tn (db:test-get-testname  trec))
 		      (ip (db:test-get-item-path trec))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -346,14 +346,14 @@
 
     (if (not (null? required-tests))
 	(debug:print-info 1 "Adding " required-tests " to the run queue"))
     ;; NOTE: these are all parent tests, items are not expanded yet.
     (debug:print-info 4 "test-records=" (hash-table->alist test-records))
-    (let ((reglen (any->number  (configf:lookup *configdat* "setup" "runqueue"))))
-      (if reglen
-	  (runs:run-tests-queue-new     run-id runname test-records keyvals flags test-patts required-tests reglen)
-	  (runs:run-tests-queue-classic run-id runname test-records keyvals flags test-patts required-tests)))
+    (let ((reglen (configf:lookup *configdat* "setup" "runqueue")))
+      (if (equal? reglen "classic")
+	  (runs:run-tests-queue-classic run-id runname test-records keyvals flags test-patts required-tests)
+	  (runs:run-tests-queue-new     run-id runname test-records keyvals flags test-patts required-tests (any->number reglen))))
     (debug:print-info 4 "All done by here")))
 
 (define (runs:calc-fails prereqs-not-met)
   (filter (lambda (test)
 	    (and (vector? test) ;; not (string? test))

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -13,14 +13,14 @@
 [setup]
 # Set launchwait to yes to use the old launch run code that waits for the launch process to return before 
 # proceeding.
 # launchwait yes
 
-# If defined the runs:run-tests-queue-new queue code is used with the register test depth
-# given. Otherwise the old code is used. The old code will be removed in the future and 
-# a default of 10 used.
-runqueue 2
+# If set to "default" the old code is used. Otherwise defaults to 200 or uses
+# numeric value given.
+#
+# runqueue 2
 
 # It is possible (but not recommended) to override the rsync command used
 # to populate the test directories. For test development the following 
 # example can be useful
 #