Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1596,10 +1596,24 @@
 
 (define db:test-record-fields '("id"           "run_id"        "testname"  "state"      "status"      "event_time"
 				"host"         "cpuload"       "diskfree"  "uname"      "rundir"   "item_path"
                                 "run_duration" "final_logf" "comment"   "shortdir"))
 
+;; fields *must* be a non-empty list
+;;
+(define (db:field->number fieldname fields)
+  (if (null? fields)
+      #f
+      (let loop ((hed  (car fields))
+		 (tal  (cdr fields))
+		 (indx 0))
+	(if (equal? fieldname hed)
+	    indx
+	    (if (null? tal)
+		#f
+		(loop (car tal)(cdr tal)(+ indx 1)))))))
+
 (define db:test-record-qry-selector (string-intersperse db:test-record-fields ","))
 
 ;; NOTE: Use db:test-get* to access records
 ;; NOTE: This needs rundir decoding? Decide, decode here or where used? For the moment decode where used.
 (define (db:get-all-tests-info-by-run-id dbstruct run-id)
@@ -1626,11 +1640,51 @@
 		   (lambda (rec)
 		     (debug:print 0 "INFO: Inserting values: " (string-intersperse (map conc (vector->list rec)) ",") "\n")
 		     (apply sqlite3:execute qry (vector->list rec)))
 		   testrecs)
 		  (sqlite3:finalize! qry)))))
+
+;; map a test-id into the proper range
+;;
+(define (db:adj-test-id mtdb min-test-id test-id)
+  (if (> test-id min-test-id)
+      test-id
+      (let loop ((new-id min-test-id))
+	(let ((test-id-found #f))
+	  (sqlite3:for-each-row 
+	   (lambda (id)
+	     (set! test-id-found id))
+	   mtdb
+	   "SELECT id FROM tests WHERE id=?;"
+	   new-id)
+	  ;; if test-id-found then need to try again
+	  (if test-id-found
+	      (loop (+ new-id 1))
+	      (begin
+		(debug:print 0 "New test id " new-id " found for test with id " test-id)
+		(sqlite3:execute mtdb "UPDATE tests SET id=? WHERE id=?;" new-id test-id)))))))
+
+;; move test ids into the 30k * run_id range
+;;
+(define (db:prep-megatest.db-adj-test-ids mtdb run-id testrecs)
+  (let ((min-test-id (* run-id 30000)))
+    (for-each 
+     (lambda (testrec)
+       (let* ((test-id (vector-ref testrec (db:field->number "id" db:test-record-fields))))
+	 (db:adj-test-id mtdb min-test-id test-id)))
+     testrecs)))
 	
+;; 1. move test ids into the 30k * run_id range
+;; 2. move step ids into the 30k * run_id range
+;;
+(define (db:prep-megatest.db-for-migration mtdb)
+  (let* ((run-ids (db:get-all-run-ids mtdb)))
+    (for-each 
+     (lambda (run-id)
+       (let ((testrecs (db:get-all-tests-info-by-run-id mtdb run-id)))
+	 (db:prep-megatest.db-adj-test-ids mtdb run-id testrecs)))
+     run-ids)))
 
 ;; Get test data using test_id
 (define (db:get-test-info-by-id dbstruct run-id test-id)
   (let ((db (db:get-db dbstruct run-id))
 	(res #f))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1293,11 +1293,17 @@
 (if (args:get-arg "-import-megatest.db")
     (let* ((toppath  (launch:setup-for-run))
 	   (dbstruct (if toppath (make-dbr:dbstruct path: toppath) #f))
 	   (mtdb     (if toppath (db:open-megatest-db)))
 	   (run-ids  (if toppath (db:get-all-run-ids mtdb))))
+
+      ;; adjust test-ids to fit into proper range
+      ;;
+      (db:prep-megatest.db-for-migration mtdb)
+
       ;; sync runs, test_meta etc.
+      ;;
       (db:sync-tables (db:sync-main-list mtdb) mtdb (db:get-db dbstruct #f))
       (for-each 
        (lambda (run-id)
 	 (let ((testrecs (db:get-all-tests-info-by-run-id mtdb run-id))
 	       (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)))