diff --git a/tests/hwsim/run-tests.py b/tests/hwsim/run-tests.py
index dea8a8ebe..b486013e8 100755
--- a/tests/hwsim/run-tests.py
+++ b/tests/hwsim/run-tests.py
@@ -155,6 +155,8 @@ def main():
     if args.database:
         import sqlite3
         conn = sqlite3.connect(args.database)
+        conn.execute('CREATE TABLE IF NOT EXISTS results (test,result,run,time,duration,build,commitid)')
+        conn.execute('CREATE TABLE IF NOT EXISTS tests (test,description)')
     else:
         conn = None
 
diff --git a/tests/hwsim/vm/inside.sh b/tests/hwsim/vm/inside.sh
index 7645083be..cbef72794 100755
--- a/tests/hwsim/vm/inside.sh
+++ b/tests/hwsim/vm/inside.sh
@@ -63,6 +63,7 @@ else
 	# finally run the tests
 	export USER=0
 	export LOGDIR=/tmp/logs
+	export DBFILE=$LOGDIR/results.db
 
 	cd $TESTDIR
 	./run-all.sh $ARGS >/dev/ttyS0 2>&1