diff --git a/tests/hwsim/vm/inside.sh b/tests/hwsim/vm/inside.sh
index 3fe37a6fd..9c6a9572b 100755
--- a/tests/hwsim/vm/inside.sh
+++ b/tests/hwsim/vm/inside.sh
@@ -45,6 +45,10 @@ fi
 
 mount --bind "$TESTDIR/vm/regdb/" /lib/firmware
 
+if [ "$MODULEDIR" != "" ] ; then
+	mount --bind $MODULEDIR /lib/modules
+fi
+
 # reload reg if (and only if) cfg80211.ko is already loaded
 iw reg reload || true
 
diff --git a/tests/hwsim/vm/vm-run.sh b/tests/hwsim/vm/vm-run.sh
index 7a0273ac4..defea43e8 100755
--- a/tests/hwsim/vm/vm-run.sh
+++ b/tests/hwsim/vm/vm-run.sh
@@ -150,6 +150,7 @@ A+="mac80211_hwsim.dyndbg=+p "
 A+="init=$CMD "
 A+="testdir=$TESTDIR "
 A+="timewarp=$TIMEWARP "
+A+="MODULEDIR=$MODULEDIR "
 A+="TELNET=$TELNET_ARG "
 A+="EPATH=$EPATH "
 A+="ARGS=$argsfile "