@@ -21,10 +21,11 @@
 (declare (uses db))
 (declare (uses tdb))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
+(declare (uses sdb))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
@@ -133,12 +134,12 @@
 ;; Check for waiver eligibility
 ;;
 (define (tests:check-waiver-eligibility testdat prev-testdat)
   (let* ((test-registry (make-hash-table))
 	 (testconfig  (tests:get-testconfig (db:test-get-testname testdat) test-registry #f))
-	 (test-rundir (db:test-get-rundir testdat))
-	 (prev-rundir (db:test-get-rundir prev-testdat))
+	 (test-rundir (sdb:qry 'getstr (db:test-get-rundir testdat)))
+	 (prev-rundir (sdb:qry 'getstr (db:test-get-rundir prev-testdat)))
 	 (waivers     (configf:section-vars testconfig "waivers"))
 	 (waiver-rx   (regexp "^(\\S+)\\s+(.*)$"))
 	 (diff-rule   "diff %file1% %file2%")
 	 (logpro-rule "diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html"))
     (if (not (file-exists? test-rundir))